# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1135149962 0
# Node ID 37160dd563fa47f0014a1c48ba8bcf398b839d75
# Parent  b7a72fc48f62204f0c7dd38b8f4283d29b65a2ad
[gaim-migrate @ 14922]
Bleeter says I broke rejoining chats. Hopefully this will fix it.

committer: Tailor Script <tailor@pidgin.im>

diff -r b7a72fc48f62 -r 37160dd563fa src/gtkblist.c
--- a/src/gtkblist.c	Wed Dec 21 05:17:57 2005 +0000
+++ b/src/gtkblist.c	Wed Dec 21 07:26:02 2005 +0000
@@ -280,8 +280,8 @@
 
 	if (conv != NULL)
 		gaim_gtkconv_present_conversation(conv);
-	else
-		serv_join_chat(chat->account->gc, chat->components);
+
+	serv_join_chat(chat->account->gc, chat->components);
 }
 
 static void gtk_blist_menu_join_cb(GtkWidget *w, GaimChat *chat)
@@ -3611,6 +3611,7 @@
 	gaim_gtk_blist_update_columns();
 
 	gtkblist->statusbox = gtk_gaim_status_box_new();
+	gtk_widget_set_name(gtkblist->statusbox, "gaim_gtkblist_statusbox");
 	
 	gtk_widget_show(gtkblist->statusbox);
 	gtk_box_pack_start(GTK_BOX(gtkblist->vbox), gtkblist->statusbox, FALSE, TRUE, 0);