# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1258356591 0
# Node ID 3e96fb2825e797d6d7042bf275b07ec0cae53d41
# Parent  851fcedadd82d065e7a1a988672243eff7dad04e
Fix alignment and widget parents of the smiley theme combo box to match
rekkanoryo's latest change.

diff -r 851fcedadd82 -r 3e96fb2825e7 pidgin/gtkprefs.c
--- a/pidgin/gtkprefs.c	Mon Nov 16 07:25:58 2009 +0000
+++ b/pidgin/gtkprefs.c	Mon Nov 16 07:29:51 2009 +0000
@@ -1058,7 +1058,7 @@
 	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 @@
 	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 @@
 	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),