# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 991180276 0
# Node ID fe79493094e7d6bd8c9c71ba0dc6f585850432cf
# Parent  b1e3b9febac7179cb38b1d31cdab7e31b985165a
[gaim-migrate @ 1928]
stupidity

committer: Tailor Script <tailor@pidgin.im>

diff -r b1e3b9febac7 -r fe79493094e7 src/buddy.c
--- a/src/buddy.c	Tue May 29 22:28:18 2001 +0000
+++ b/src/buddy.c	Tue May 29 23:51:16 2001 +0000
@@ -485,8 +485,10 @@
 	update_keepalive(gc, FALSE);
 	serv_close(gc);
 	redo_buddy_list();
+	build_edit_tree();
 	do_away_menu();
 	do_proto_menu();
+	redo_convo_menus();
 #ifdef USE_APPLET
 	if (connections)
 		set_user_state(online);
diff -r b1e3b9febac7 -r fe79493094e7 src/conversation.c
--- a/src/conversation.c	Tue May 29 22:28:18 2001 +0000
+++ b/src/conversation.c	Tue May 29 23:51:16 2001 +0000
@@ -1864,7 +1864,7 @@
 
 		create_convo_menu(C);
 
-		if (g_slist_index(connections, C->gc) < 0)
+		if (g_slist_index(connections, C->gc) >= 0)
 			continue;
 
 		set_convo_gc(C, connections ? connections->data : NULL);
@@ -1876,7 +1876,7 @@
 	if (c->gc == gc)
 		return;
 
-	if (c->gc && c->gc->prpl && c->gc->prpl->remove_convo)
+	if (c->gc && g_slist_find(connections, c->gc) && c->gc->prpl && c->gc->prpl->remove_convo)
 		(*c->gc->prpl->remove_convo)(c->gc, c);
 
 	c->gc = gc;
diff -r b1e3b9febac7 -r fe79493094e7 src/multi.c
--- a/src/multi.c	Tue May 29 22:28:18 2001 +0000
+++ b/src/multi.c	Tue May 29 23:51:16 2001 +0000
@@ -96,7 +96,6 @@
 		g_free(m);
 	}
 	g_free(gc);
-	redo_convo_menus();
 #ifndef USE_APPLET
 	if (!connections && mainwindow)
 		gtk_widget_show(mainwindow);
@@ -767,7 +766,6 @@
 		return;
 	i = gtk_clist_find_row_from_data(GTK_CLIST(list), gc->user);
 	gtk_clist_set_text(GTK_CLIST(list), i, 1, "No");
-	redo_convo_menus();
 }
 
 void auto_login()
diff -r b1e3b9febac7 -r fe79493094e7 src/server.c
--- a/src/server.c	Tue May 29 22:28:18 2001 +0000
+++ b/src/server.c	Tue May 29 23:51:16 2001 +0000
@@ -83,7 +83,6 @@
 
 	account_offline(gc);
 	destroy_gaim_conn(gc);
-	build_edit_tree();
 }
 
 void serv_touch_idle(struct gaim_connection *gc)