pidgin: 62c4d47e: Fix the Group selectors on gevolution pl...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 62c4d47ef2cfb0a38b3ea3d6583e82743ff22782
Ancestor: 2ffdb14dbd9f7b34db8ddaecfa11fa9adfff2527
Author: nosnilmot at pidgin.im
Date: 2010-05-27T19:45:20
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/62c4d47ef2cfb0a38b3ea3d6583e82743ff22782

Modified files:
        pidgin/plugins/gevolution/add_buddy_dialog.c
        pidgin/plugins/gevolution/new_person_dialog.c

ChangeLog: 

Fix the Group selectors on gevolution plugin add buddy and new person
dialogs

-------------- next part --------------
============================================================
--- pidgin/plugins/gevolution/add_buddy_dialog.c	d54c884de360e39c1d91ef94073ebd56f4e3f4a5
+++ pidgin/plugins/gevolution/add_buddy_dialog.c	10f6fcc2130808e1c754bfc740e22ef1b9b3318d
@@ -546,19 +546,11 @@ gevo_add_buddy_dialog_show(PurpleAccount
 	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... */
 
============================================================
--- pidgin/plugins/gevolution/new_person_dialog.c	799e00becfdb90c0b6c54484ea94a0e65c1f681d
+++ pidgin/plugins/gevolution/new_person_dialog.c	41a0a97e858d6942ca14fec5ac9f7240443a8ad1
@@ -293,9 +293,10 @@ gevo_new_person_dialog_show(EBook *book,
 						 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();