Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv30743
Modified Files:
buddy.c
Log Message:
This will cure all that ails you.
Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.275
retrieving revision 1.276
diff -u -d -r1.275 -r1.276
--- buddy.c 2001/11/17 14:26:17 1.275
+++ buddy.c 2001/11/20 06:53:45 1.276
@@ -283,6 +283,7 @@
g_free(bs->name);
g_free(bs);
}
+ update_num_group(gs);
} else {
gtk_label_set_text(GTK_LABEL(bs->label), b->show);
update_idle_time(bs);
@@ -819,6 +820,7 @@
if (bs) {
if (g_slist_find(bs->connlist, gc)) {
bs->connlist = g_slist_remove(bs->connlist, gc);
+ update_num_group(gs);
if (!g_slist_length(bs->connlist)) {
gs->members = g_slist_remove(gs->members, bs);
if (bs->log_timer > 0)
@@ -834,14 +836,10 @@
gtk_tree_remove_item(GTK_TREE(buddies), gs->item);
g_free(gs->name);
g_free(gs);
- } else
- update_num_group(gs);
- } else
- update_num_group(gs);
- } else
- update_num_group(gs);
- } else
- update_num_group(gs);
+ }
+ }
+ }
+ }
}
c = find_conversation(rem_b->name);
@@ -963,6 +961,7 @@
bs = new_buddy_show(gs, b, (char **)no_icon_xpm);
}
bs->connlist = g_slist_append(bs->connlist, gc);
+ update_num_group(gs);
}
}
}
@@ -2076,8 +2075,10 @@
gs = new_group_show(g->name);
if ((bs = find_buddy_show(gs, b->name)) == NULL)
bs = new_buddy_show(gs, b, (char **)login_icon_xpm);
- if (!g_slist_find(bs->connlist, gc))
+ if (!g_slist_find(bs->connlist, gc)) {
bs->connlist = g_slist_append(bs->connlist, gc);
+ update_num_group(gs);
+ }
if (b->present == 1) {
if (bs->sound != 2)
play_sound(BUDDY_ARRIVE);
@@ -2096,7 +2097,6 @@
if (bs->log_timer > 0)
gtk_timeout_remove(bs->log_timer);
bs->log_timer = gtk_timeout_add(10000, (GtkFunction)log_timeout, bs);
- update_num_group(gs);
if ((bs->sound != 2) && (im_options & OPT_IM_LOGON)) {
struct conversation *c = find_conversation(b->name);
if (c) {
@@ -2138,10 +2138,10 @@
play_sound(BUDDY_LEAVE);
bs->connlist = g_slist_remove(bs->connlist, gc);
+ update_num_group(gs);
if (bs->log_timer > 0)
gtk_timeout_remove(bs->log_timer);
bs->log_timer = gtk_timeout_add(10000, (GtkFunction)log_timeout, bs);
- update_num_group(gs);
pm = gdk_pixmap_create_from_xpm_d(blist->window, &bm, NULL, logout_icon_xpm);
gtk_widget_hide(bs->pix);
gtk_pixmap_set(GTK_PIXMAP(bs->pix), pm, bm);
|
