# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1274989520 0
# Node ID 208641cbe9799c9b5c97dd6431a1c078514a233c
# Parent  34cd785f849c8158f6c8e4abc9868437ad95808a
Fix the Group selectors on gevolution plugin add buddy and new person
dialogs

diff -r 34cd785f849c -r 208641cbe979 pidgin/plugins/gevolution/add_buddy_dialog.c
--- a/pidgin/plugins/gevolution/add_buddy_dialog.c	Thu May 27 18:56:33 2010 +0000
+++ b/pidgin/plugins/gevolution/add_buddy_dialog.c	Thu May 27 19:45:20 2010 +0000
@@ -546,19 +546,11 @@
 	gtk_combo_box_set_active(GTK_COMBO_BOX(dialog->addrbooks_combo), 0);
 
 	/* Group box */
-	hbox = gtk_hbox_new(FALSE, 6);
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-	gtk_widget_show(hbox);
-
-	label = gtk_label_new(_("Group:"));
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	gtk_widget_show(label);
-
 	dialog->group_combo =
-		pidgin_text_combo_box_entry_new(NULL, gevo_get_groups());
-	gtk_box_pack_start(GTK_BOX(hbox), dialog->group_combo, TRUE, TRUE, 0);
-	gtk_widget_show(dialog->group_combo);
+		pidgin_text_combo_box_entry_new(group, gevo_get_groups());
+	pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("Group:"), NULL,
+							  dialog->group_combo, TRUE, NULL);
+	gtk_widget_show_all(dialog->group_combo);
 
 	/* Cool. Now we only have a little left... */
 
diff -r 34cd785f849c -r 208641cbe979 pidgin/plugins/gevolution/new_person_dialog.c
--- a/pidgin/plugins/gevolution/new_person_dialog.c	Thu May 27 18:56:33 2010 +0000
+++ b/pidgin/plugins/gevolution/new_person_dialog.c	Thu May 27 19:45:20 2010 +0000
@@ -293,9 +293,10 @@
 						 G_CALLBACK(username_changed_cb), dialog);
 
 		/* Group */
-		dialog->group_combo = pidgin_text_combo_box_entry_new(NULL,
+		dialog->group_combo = pidgin_text_combo_box_entry_new(group,
 			gevo_get_groups());
 		add_pref_box(sg, vbox, _("Group:"), dialog->group_combo);
+		gtk_widget_show_all(dialog->group_combo);
 
 		/* Separator */
 		sep = gtk_hseparator_new();