Changeset 6197702 for storage.c

Timestamp:

2010-10-09T18:41:19Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d150a9d

Parents:

23b29c6 (diff), 27b407f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging OTR branch. It's more or less a plugin if you enable it, and
otherwise a no-op. DO NOT INSTALL THIS ON PUBLIC SERVERS.

File:

• storage.c (modified) (5 diffs)

storage.c

@@ -115 +115 @@
                 status = st->load(irc, password);
                 if (status == STORAGE_OK)
+                {
+                        GSList *l;
+                        for( l = irc_plugins; l; l = l->next )
+                        {
+                                irc_plugin_t *p = l->data;
+                                if( p->storage_load )
+                                        p->storage_load( irc );
+                        }
                         return status;
+                }
                 
                 if (status != STORAGE_NO_SUCH_USER) 
@@ -127 +136 @@
 {
         storage_status_t st;
+        GSList *l;
         
         if (password != NULL) {
@@ -140 +150 @@
         st = ((storage_t *)global.storage->data)->save(irc, overwrite);
         
+        for( l = irc_plugins; l; l = l->next )
+        {
+                irc_plugin_t *p = l->data;
+                if( p->storage_save )
+                        p->storage_save( irc );
+        }
+        
         if (password != NULL) {
                 irc_setpass(irc, NULL);
@@ -151 +168 @@
         GList *gl;
         storage_status_t ret = STORAGE_OK;
+        gboolean ok = FALSE;
+        GSList *l;
         
         /* Remove this account from all storage backends. If this isn't 
@@ -160 +179 @@
 
                 status = st->remove(nick, password);
+                ok |= status == STORAGE_OK;
                 if (status != STORAGE_NO_SUCH_USER && status != STORAGE_OK)
                         ret = status;
         }
+        
+        /* If at least one succeeded, remove plugin data. */
+        if( ok )
+                for( l = irc_plugins; l; l = l->next )
+                {
+                        irc_plugin_t *p = l->data;
+                        if( p->storage_remove )
+                                p->storage_remove( nick );
+                }
         
         return ret;