Changeset 2dcaf9a

Timestamp:

2010-09-01T22:35:06Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

76e2f62, 858ea01

Parents:

934db064

Message:

Load/save code. It'd be better if the OTR module would just save its info
in BitlBee settings that automatically end up in the existing .xml files
(or whatever storage is used), but I realise this is non-trivial.

Files:

• irc.h (modified) (1 diff)
• otr.c (modified) (2 diffs)
• storage.c (modified) (5 diffs)

irc.h

@@ -240 +240 @@
            message and don't want anything to go to the user. */
         char* (*filter_msg_in)( irc_user_t *iu, char *msg, int flags );
+        
+        /* From storage.c functions. Ideally these should not be used
+           and instead data should be stored in settings which will get
+           saved automatically. Consider these deprecated! */
+        void (*storage_load)( irc_t *irc );
+        void (*storage_save)( irc_t *irc );
+        void (*storage_remove)( const char *nick );
 } irc_plugin_t;
 

otr.c

@@ -448 +448 @@
         otr_filter_msg_out,
         otr_filter_msg_in,
+        otr_load,
+        otr_save,
+        otr_remove,
 };
 
@@ -1663 +1666 @@
                 fclose(irc->otr->from);
                 fclose(irc->otr->to);
+                irc->otr->from = irc->otr->to = NULL;
                 kill(irc->otr->keygen, SIGTERM);
                 waitpid(irc->otr->keygen, NULL, 0);

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;