Changeset eabc9d2 for protocols

Timestamp:

2010-04-11T22:49:32Z (15 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().

Location:

protocols

Files:

• bee.h (modified) (1 diff)
• bee_user.c (modified) (1 diff)
• nogaim.c (modified) (2 diffs)

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 ) );
 }