cpw.rekkanoryo.prefs_window: cac7dea7: Fix alignment and widget parents of the ...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: cac7dea7f67328973452405822515b7ea5a15c71
Ancestor: dc10c623b77ec4bb37d37c5e674c3d6dceda5ef3
Author: qulogic at pidgin.im
Date: 2009-11-16T07:29:51
Branch: im.pidgin.cpw.rekkanoryo.prefs_window
URL: http://d.pidgin.im/viewmtn/revision/info/cac7dea7f67328973452405822515b7ea5a15c71

Modified files:
        pidgin/gtkprefs.c

ChangeLog: 

Fix alignment and widget parents of the smiley theme combo box to match
rekkanoryo's latest change.

-------------- next part --------------
============================================================
--- pidgin/gtkprefs.c	82fb49bc3abd1383daeb346b8347ccc992473a67
+++ pidgin/gtkprefs.c	737179b18cfb920784c4ba6013a0184704c8121e
@@ -1058,7 +1058,7 @@ theme_page(void)
 	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 	gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
 
-	gtk_box_pack_start(GTK_BOX(ret), label, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
 	gtk_widget_show(label);
 
 	/* Buddy List Themes */
@@ -1119,6 +1119,7 @@ theme_page(void)
 	themesel_hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
 
 	label = gtk_label_new(_("Smiley Theme:"));
+	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 	gtk_size_group_add_widget(label_sg, label);
 	gtk_box_pack_start(GTK_BOX(themesel_hbox), label, FALSE, FALSE, 0);
 
@@ -1130,7 +1131,7 @@ theme_page(void)
 	gtk_size_group_add_widget(combo_sg, prefs_smiley_themes_combo_box);
 	gtk_box_pack_start(GTK_BOX(themesel_hbox), prefs_smiley_themes_combo_box, FALSE, FALSE, 0);
 
-	gtk_box_pack_start(GTK_BOX(ret), themesel_hbox, FALSE, FALSE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), themesel_hbox, FALSE, FALSE, 0);
 
 	/* Custom sort so "none" theme is at top of list */
 	gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(prefs_smiley_themes),