[Xfce4-commits] r29693 - in xfdesktop/trunk: . src

[Brian Tarricone]

Author: kelnos
Date: 2009-04-02 06:34:40 +0000 (Thu, 02 Apr 2009)
New Revision: 29693

Modified:
   xfdesktop/trunk/NEWS
   xfdesktop/trunk/src/xfdesktop-file-icon-manager.c
Log:
make default action ('accept') in both delete dialogs consistent

Modified: xfdesktop/trunk/NEWS
===================================================================
--- xfdesktop/trunk/NEWS	2009-04-02 06:23:41 UTC (rev 29692)
+++ xfdesktop/trunk/NEWS	2009-04-02 06:34:40 UTC (rev 29693)
@@ -6,6 +6,8 @@
     quits (bug 5154).
   * Reload the backdrop and icon view when 'xfdesktop --reload'
     is run (bug 5156).
+  * Make default button in 'delete multiple' dialog consistent with
+    default in 'delete single' dialog (bug 5140).
 
 
 Xfce 4.6.0

Modified: xfdesktop/trunk/src/xfdesktop-file-icon-manager.c
===================================================================
--- xfdesktop/trunk/src/xfdesktop-file-icon-manager.c	2009-04-02 06:23:41 UTC (rev 29692)
+++ xfdesktop/trunk/src/xfdesktop-file-icon-manager.c	2009-04-02 06:34:40 UTC (rev 29693)
@@ -744,19 +744,19 @@
         gtk_container_add(GTK_CONTAINER(sw), treeview);
         
         cancel_btn = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
-        GTK_WIDGET_SET_FLAGS(cancel_btn, GTK_CAN_DEFAULT);
         gtk_widget_show(cancel_btn);
         gtk_dialog_add_action_widget(GTK_DIALOG(dlg), cancel_btn,
                                      GTK_RESPONSE_CANCEL);
         
         delete_btn = gtk_button_new_from_stock(GTK_STOCK_DELETE);
+        GTK_WIDGET_SET_FLAGS(delete_btn, GTK_CAN_DEFAULT);
         gtk_widget_show(delete_btn);
         gtk_dialog_add_action_widget(GTK_DIALOG(dlg), delete_btn,
                                      GTK_RESPONSE_ACCEPT);
         
-        gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_CANCEL);
+        gtk_dialog_set_default_response(GTK_DIALOG(dlg), GTK_RESPONSE_ACCEPT);
         gtk_widget_show(dlg);
-        gtk_widget_grab_focus(cancel_btn);
+        gtk_widget_grab_focus(delete_btn);
         
         ret = gtk_dialog_run(GTK_DIALOG(dlg));
         gtk_widget_destroy(dlg);