aboutsummaryrefslogtreecommitdiffstats
path: root/protocols/nogaim.c
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2010-04-12 00:49:32 +0200
committerWilmer van der Gaast <wilmer@gaast.net>2010-04-12 00:49:32 +0200
commiteabc9d2c1b1d29aeb47162da64ce2b607c3d43ff (patch)
tree0f6258df41bf50a6b3bb5e7eefbba0bcfa687443 /protocols/nogaim.c
parentd986463c9e026b2a5f003f44db3105aa5449fc27 (diff)
Fixed cleanup issues when turning off an account. Also fixed syntax of
*_user_free().
Diffstat (limited to 'protocols/nogaim.c')
-rw-r--r--protocols/nogaim.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/protocols/nogaim.c b/protocols/nogaim.c
index cbfbe00a..4dd60ea6 100644
--- a/protocols/nogaim.c
+++ b/protocols/nogaim.c
@@ -326,12 +326,15 @@ void imc_logout( struct im_connection *ic, int allow_reconnect )
g_free( ic->away );
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;
}
//query_del_by_conn( ic->irc, ic );
@@ -402,7 +405,7 @@ void imcb_rename_buddy( struct im_connection *ic, const char *handle, const char
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 ) );
}
/* Mainly meant for ICQ (and now also for Jabber conferences) to allow IM