im.pidgin.pidgin: 2c46d2ca79e9a3064411432447e30fed9516542b

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 2c46d2ca79e9a3064411432447e30fed9516542b
Ancestor: f1f4aea1b8d35478989dfc76c28cad9c5664e150
Author: sadrul at pidgin.im
Date: 2008-01-12T07:48:38
Branch: im.pidgin.pidgin

Modified files:
        pidgin/gtkblist.c pidgin/gtkprefs.c

ChangeLog: 

Clean up an earlier commit. Fixes CID #379, and #378.

-------------- next part --------------
============================================================
--- pidgin/gtkblist.c	aabb41c80ff78c6ba698a1275f1b3e6e2941e908
+++ pidgin/gtkblist.c	670c2b74b5ddb4ddacbccaf0110786a08b0625be
@@ -937,7 +937,6 @@ pidgin_blist_joinchat_show(void)
 pidgin_blist_joinchat_show(void)
 {
 	GtkWidget *hbox, *vbox;
-	GtkWidget *rowbox;
 	GtkWidget *label;
 	PidginBuddyList *gtkblist;
 	GtkWidget *img = NULL;
@@ -981,7 +980,6 @@ pidgin_blist_joinchat_show(void)
 	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);
 
============================================================
--- pidgin/gtkprefs.c	8d21736ffc6f9e5ba625cd63474cf5acf3355953
+++ pidgin/gtkprefs.c	ce3929817b05f616d99a17e55690c389d3d76baa
@@ -1457,15 +1457,15 @@ browser_page(void)
 	}
 
 	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);