Changeset 6ce2240 for irc.c

Timestamp:

2010-09-30T06:02:01Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

560129a

Parents:

858ea01 (diff), 4752063 (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 some fixes from pesco. Adds support for the SMP flavour used by Pidgin
(otr smpq).

File:

• irc.c (modified) (2 diffs)

irc.c

@@ -222 +222 @@
         log_message( LOGLVL_INFO, "Destroying connection with fd %d", irc->fd );
         
+        if( irc->status & USTATUS_IDENTIFIED && set_getbool( &irc->b->set, "save_on_quit" ) ) 
+                if( storage_save( irc, NULL, TRUE ) != STORAGE_OK )
+                        log_message( LOGLVL_WARNING, "Error while saving settings for user %s", irc->user->nick );
+        
         for( l = irc_plugins; l; l = l->next )
         {
@@ -228 +232 @@
                         p->irc_free( irc );
         }
-        
-        if( irc->status & USTATUS_IDENTIFIED && set_getbool( &irc->b->set, "save_on_quit" ) ) 
-                if( storage_save( irc, NULL, TRUE ) != STORAGE_OK )
-                        log_message( LOGLVL_WARNING, "Error while saving settings for user %s", irc->user->nick );
         
         irc_connection_list = g_slist_remove( irc_connection_list, irc );