[Gaim-commits] CVS: gaim/src buddy.c,1.290,1.291 dialogs.c,1.310,1.311

[Sean E. <sea...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv464/src

Modified Files:
	buddy.c dialogs.c 
Log Message:
Better support for Jabber resources by Jim Seymour


Index: buddy.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/buddy.c,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -d -r1.290 -r1.291
--- buddy.c	14 Mar 2002 03:29:03 -0000	1.290
+++ buddy.c	15 Mar 2002 20:09:13 -0000	1.291
@@ -833,6 +833,20 @@
 }
 
 
+/*
+ * Find and remove CTree node associated with buddylist entry
+ */
+static void ui_remove_buddy_node(struct group *rem_g, struct buddy *rem_b)
+{
+	GtkCTreeNode *gnode = NULL, *bnode;
+
+	if((gnode = gtk_ctree_find_by_row_data(GTK_CTREE(edittree), NULL, rem_g)) != NULL &&
+		(bnode = gtk_ctree_find_by_row_data(GTK_CTREE(edittree), gnode, rem_b)) != NULL)
+	{
+		gtk_ctree_remove_node(GTK_CTREE(edittree), bnode);
+	}
+}
+
 void ui_remove_buddy(struct gaim_connection *gc, struct group *rem_g, struct buddy *rem_b)
 {
 	struct conversation *c;
@@ -870,6 +884,10 @@
 	c = find_conversation(rem_b->name);
 	if (c)
 		update_buttons_by_protocol(c);
+
+	/* Remove CTree node for buddy */
+	ui_remove_buddy_node(rem_g, rem_b);
+
 }
 
 void ui_remove_group(struct gaim_connection *gc, struct group *rem_g)
@@ -1284,7 +1302,6 @@
 			gct = b->gc;
 			serv_remove_buddy(b->gc, b->name, g->name);
 			remove_buddy(b->gc, g, b);
-			gtk_ctree_remove_node(GTK_CTREE(edittree), node);
 			do_export(gct);
 		} else if (*type == EDIT_GROUP) {
 			struct gaim_connection *gc = ((struct group *)type)->gc;

Index: dialogs.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/dialogs.c,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -d -r1.310 -r1.311
--- dialogs.c	15 Mar 2002 02:13:45 -0000	1.310
+++ dialogs.c	15 Mar 2002 20:09:13 -0000	1.311
@@ -469,7 +469,6 @@
 	serv_remove_buddy(b->gc, b->name, g->name);
 	remove_buddy(gc, g, b);
 	do_export(gc);
-	build_edit_tree();
 
 	cv = find_conversation(b->name);