diff pidgin/gtkrequest.c @ 22146:3c814c64a507

merge of '4b5e932e01a84088124dee9791809545cdc9240b' and 'e4081b0fea9b2e91db9a532aa729cfc1c078f287'
author Sean Egan <seanegan@gmail.com>
date Thu, 17 Jan 2008 20:44:48 +0000
parents 9df0a8c7c9b7
children d6220093543b
line wrap: on
line diff
--- a/pidgin/gtkrequest.c	Thu Jan 17 20:37:22 2008 +0000
+++ b/pidgin/gtkrequest.c	Thu Jan 17 20:44:48 2008 +0000
@@ -663,7 +663,11 @@
 		gtk_widget_grab_focus(img);
 		gtk_widget_grab_default(img);
 	} else
-		gtk_dialog_set_default_response(GTK_DIALOG(dialog), default_action);
+		/*
+		 * Need to invert the default_action number because the
+		 * buttons are added to the dialog in reverse order.
+		 */
+		gtk_dialog_set_default_response(GTK_DIALOG(dialog), action_count - 1 - default_action);
 
 	/* Show everything. */
 	pidgin_auto_parent_window(dialog);
@@ -1007,6 +1011,7 @@
 
 	/* Create the tree view */
 	treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store));
+	g_object_unref(G_OBJECT(store));
 	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE);
 
 	sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));