[Gaim-commits] CVS: gaim/src blist.c,1.9,1.10

[Nathan W. <fac...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory sc8-pr-cvs1:/tmp/cvs-serv32688/src

Modified Files:
	blist.c 
Log Message:
lets see if we can get group numbers right for chats ;-)


Index: blist.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/blist.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- blist.c	1 May 2003 19:34:30 -0000	1.9
+++ blist.c	3 May 2003 02:20:03 -0000	1.10
@@ -338,8 +338,10 @@
 		 * being moved.
 		 */
 		((struct group *)cnode->parent)->totalsize--;
-		if (chat->account->gc)
+		if (chat->account->gc) {
+			((struct group *)cnode->parent)->online--;
 			((struct group *)cnode->parent)->currentsize--;
+		}
 		if(cnode->next)
 			cnode->next->prev = cnode->prev;
 		if(cnode->prev)
@@ -347,8 +349,6 @@
 		if(cnode->parent->child == cnode)
 			cnode->parent->child = cnode->next;
 
-		((struct group *)((GaimBlistNode *)chat)->parent)->online--;
-
 		ops->remove(gaimbuddylist, cnode);
 
 		save = TRUE;
@@ -362,19 +362,21 @@
 		cnode->parent = n->parent;
 		n->next = cnode;
 		((struct group *)n->parent)->totalsize++;
-		if (chat->account->gc)
+		if (chat->account->gc) {
+			((struct group *)n->parent)->online++;
 			((struct group *)n->parent)->currentsize++;
+		}
 	} else {
 		((GaimBlistNode*)g)->child = cnode;
 		cnode->next = cnode->prev = NULL;
 		cnode->parent = (GaimBlistNode*)g;
 		g->totalsize++;
-		if (chat->account->gc)
+		if (chat->account->gc) {
+			g->online++;
 			g->currentsize++;
+		}
 	}
 
-	((struct group *)((GaimBlistNode *)chat)->parent)->online++;
-
 	if (ops)
 		ops->update(gaimbuddylist, (GaimBlistNode*)cnode);
 	if (save)
@@ -726,6 +728,7 @@
 				}
 			} else if(GAIM_BLIST_NODE_IS_CHAT(buddy)) {
 				if (account == ((struct chat*)buddy)->account) {
+					((struct group *)group)->online++;
 					((struct group *)group)->currentsize++;
 					if(ops)
 						ops->update(gaimbuddylist, buddy);