# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1200124118 0
# Node ID 1d02fa7737ebada3cfc9a36b3024502f81451a84
# Parent  a2db27c84346e6329589efc15b29b4c586f4aab3
Clean up an earlier commit. Fixes CID #379, and #378.

diff -r a2db27c84346 -r 1d02fa7737eb pidgin/gtkblist.c
--- a/pidgin/gtkblist.c	Sat Jan 12 07:31:25 2008 +0000
+++ b/pidgin/gtkblist.c	Sat Jan 12 07:48:38 2008 +0000
@@ -937,7 +937,6 @@
 pidgin_blist_joinchat_show(void)
 {
 	GtkWidget *hbox, *vbox;
-	GtkWidget *rowbox;
 	GtkWidget *label;
 	PidginBuddyList *gtkblist;
 	GtkWidget *img = NULL;
@@ -981,7 +980,6 @@
 	data->account_menu = pidgin_account_option_menu_new(NULL, FALSE,
 			G_CALLBACK(joinchat_select_account_cb),
 			chat_account_filter_func, data);
-	gtk_box_pack_start(GTK_BOX(rowbox), data->account_menu, TRUE, TRUE, 0);
 
 	pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("_Account:"), data->sg, data->account_menu, TRUE, NULL);
 
diff -r a2db27c84346 -r 1d02fa7737eb pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c	Sat Jan 12 07:31:25 2008 +0000
+++ b/pidgin/gtkprefs.c	Sat Jan 12 07:48:38 2008 +0000
@@ -1457,15 +1457,15 @@
 	}
 
 	entry = gtk_entry_new();
-	if (strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/browser"), "custom"))
-		gtk_widget_set_sensitive(hbox, FALSE);
-	purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/browsers/browser",
-								browser_changed2_cb, hbox);
 	gtk_entry_set_text(GTK_ENTRY(entry),
 					   purple_prefs_get_path(PIDGIN_PREFS_ROOT "/browsers/command"));
 	g_signal_connect(G_OBJECT(entry), "focus-out-event",
 					 G_CALLBACK(manual_browser_set), NULL);
-	pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("_Manual:\n(%s for URL)"), sg, entry, TRUE, NULL);
+	hbox = pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("_Manual:\n(%s for URL)"), sg, entry, TRUE, NULL);
+	if (strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/browser"), "custom"))
+		gtk_widget_set_sensitive(hbox, FALSE);
+	purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/browsers/browser",
+			browser_changed2_cb, hbox);
 
 	gtk_widget_show_all(ret);
 	g_object_unref(sg);