Changeset eabc9d2

Timestamp:

2010-04-11T22:49:32Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

6c56f42

Parents:

d986463

Message:

Fixed cleanup issues when turning off an account. Also fixed syntax of
*_user_free().

Files:

• irc.c (modified) (1 diff)
• irc.h (modified) (1 diff)
• irc_im.c (modified) (1 diff)
• irc_user.c (modified) (1 diff)
• protocols/bee.h (modified) (1 diff)
• protocols/bee_user.c (modified) (1 diff)
• protocols/nogaim.c (modified) (2 diffs)
• root_commands.c (modified) (1 diff)

irc.c

@@ -210 +210 @@
         
         while( irc->users )
-        {
-                irc_user_t *iu = irc->users->data;
-                irc_user_free( irc, iu->nick );
-        }
+                irc_user_free( irc, (irc_user_t *) irc->users->data );
         
         while( irc->channels )

irc.h

@@ -204 +204 @@
 /* irc_user.c */
 irc_user_t *irc_user_new( irc_t *irc, const char *nick );
-int irc_user_free( irc_t *irc, const char *nick );
+int irc_user_free( irc_t *irc, irc_user_t *iu );
 irc_user_t *irc_user_by_name( irc_t *irc, const char *nick );
 int irc_user_set_nick( irc_user_t *iu, const char *new );

irc_im.c

@@ -74 +74 @@
 static gboolean bee_irc_user_free( bee_t *bee, bee_user_t *bu )
 {
-        return irc_user_free( bee->ui_data, bu->ui_data );
+        return irc_user_free( bee->ui_data, (irc_user_t *) bu->ui_data );
 }
 

irc_user.c

@@ -47 +47 @@
 }
 
-int irc_user_free( irc_t *irc, const char *nick )
+int irc_user_free( irc_t *irc, irc_user_t *iu )
 {
-        irc_user_t *iu;
         GSList *l;
         
-        if( !( iu = irc_user_by_name( irc, nick ) ) )
+        if( !iu )
                 return 0;
         

protocols/bee.h

@@ -85 +85 @@
 /* bee_user.c */
 bee_user_t *bee_user_new( bee_t *bee, struct im_connection *ic, const char *handle );
-int bee_user_free( bee_t *bee, struct im_connection *ic, const char *handle );
+int bee_user_free( bee_t *bee, bee_user_t *bu );
 bee_user_t *bee_user_by_handle( bee_t *bee, struct im_connection *ic, const char *handle );
 int bee_user_msg( bee_t *bee, bee_user_t *bu, const char *msg, int flags );

protocols/bee_user.c

@@ -46 +46 @@
 }
 
-int bee_user_free( bee_t *bee, struct im_connection *ic, const char *handle )
+int bee_user_free( bee_t *bee, bee_user_t *bu )
 {
-        bee_user_t *bu;
-        
-        if( ( bu = bee_user_by_handle( bee, ic, handle ) ) == NULL )
+        if( !bu )
                 return 0;
         

protocols/nogaim.c

@@ -327 +327 @@
         ic->away = NULL;
         
-        for( l = bee->users; l; l = l->next )
+        for( l = bee->users; l; )
         {
                 bee_user_t *bu = l->data;
+                GSList *next = l->next;
                 
                 if( bu->ic == ic )
-                        bee_user_free( bee, ic, bu->handle );
+                        bee_user_free( bee, bu );
+                
+                l = next;
         }
         
@@ -403 +406 @@
 void imcb_remove_buddy( struct im_connection *ic, const char *handle, char *group )
 {
-        bee_user_free( ic->bee, ic, handle );
+        bee_user_free( ic->bee, bee_user_by_handle( ic->bee, ic, handle ) );
 }
 

root_commands.c

@@ -633 +633 @@
         bu->ic->acc->prpl->remove_buddy( bu->ic, bu->handle, NULL );
         nick_del( bu->ic->acc, bu->handle );
-        irc_user_free( irc, cmd[1] );
+        //TODO(wilmer): bee_user_free() and/or let the IM mod do it? irc_user_free( irc, cmd[1] );
         
         irc_usermsg( irc, "Buddy `%s' (nick %s) removed from contact list", s, cmd[1] );