Changeset d33679e

Timestamp:

2010-04-14T12:17:12Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

d7d677d

Parents:

21c87a7

Message:

Call bee_free() from irc_free() or daemon mode gets pretty sad.

Files:

• irc.c (modified) (2 diffs)
• protocols/bee.c (modified) (1 diff)

irc.c

@@ -198 +198 @@
         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 )
-                        irc_usermsg( irc, "Error while saving settings!" );
-        */
+                        log_message( LOGLVL_WARNING, "Error while saving settings for user %s", irc->user->nick );
         
         irc_connection_list = g_slist_remove( irc_connection_list, irc );
         
-        /*
         while( irc->queries != NULL )
                 query_del( irc, irc->queries );
-        */
+        
+        /* This is a little bit messy: bee_free() frees all b->users which
+           calls us back to free the corresponding irc->users. So do this
+           before we clear the remaining ones ourselves. */
+        bee_free( irc->b );
         
         while( irc->users )
@@ -240 +241 @@
         g_free( irc->sendbuffer );
         g_free( irc->readbuffer );
-        
         g_free( irc->password );
         

protocols/bee.c

@@ -52 +52 @@
 void bee_free( bee_t *b )
 {
-        account_t *acc = b->accounts;
-        
-        while( acc )
+        while( b->accounts )
         {
-                if( acc->ic )
-                        imc_logout( acc->ic, FALSE );
-                else if( acc->reconnect )
-                        cancel_auto_reconnect( acc );
+                if( b->accounts->ic )
+                        imc_logout( b->accounts->ic, FALSE );
+                else if( b->accounts->reconnect )
+                        cancel_auto_reconnect( b->accounts );
                 
-                if( acc->ic == NULL )
-                        account_del( b, acc );
+                if( b->accounts->ic == NULL )
+                        account_del( b, b->accounts );
                 else
                         /* Nasty hack, but account_del() doesn't work in this
                            case and we don't want infinite loops, do we? ;-) */
-                        acc = acc->next;
+                        b->accounts = b->accounts->next;
         }