gtk/gtkfilechooserdefault.c set alternative button order for overwrite

2008-03-13  Sven Neumann  <sven@gimp.org>

	* gtk/gtkfilechooserdefault.c
	* gtk/gtkprintunixdialog.c: set alternative button order for
	overwrite confirmation dialogs (bug #522191).

svn path=/trunk/; revision=19866

diff --git a/ChangeLog b/ChangeLog
index c98a7df74fbe9456cd51721271d15b6cd9330a71..eb1b9ffdf0a93137a2102c9db603c529bcc8f3ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-13  Sven Neumann  <sven@gimp.org>
+
+       * gtk/gtkfilechooserdefault.c
+       * gtk/gtkprintunixdialog.c: set alternative button order for
+       overwrite confirmation dialogs (bug #522191).
+
 2008-03-13  Sven Neumann  <sven@gimp.org>
 
        * gtk/gtkprintunixdialog.c (add_custom_button_to_dialog)

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index d7da3d221b0c03efacc6be0b46a82771860376c1..73e71424e0de885eb3f8cb8524a7f7db26c33c47 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -8093,9 +8093,14 @@ confirm_dialog_should_accept_filename (GtkFileChooserDefault *impl,
                                            folder_display_name);
 
   gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
-  add_custom_button_to_dialog (GTK_DIALOG (dialog), _("_Replace"), GTK_STOCK_SAVE_AS, GTK_RESPONSE_ACCEPT);
+  add_custom_button_to_dialog (GTK_DIALOG (dialog), _("_Replace"),
+                               GTK_STOCK_SAVE_AS, GTK_RESPONSE_ACCEPT);
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_ACCEPT,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
-  
+
   if (toplevel->group)
     gtk_window_group_add_window (toplevel->group, GTK_WINDOW (dialog));
 

diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index 659b46da444d422444ae46379a34ac8f7005267a..e9937a05692ffa5a19d3a2ff43ecd88300db827b 100644 (file)
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -365,6 +365,10 @@ overwrite_confirmation_dialog (GtkPrintUnixDialog *print_dialog,
                                                _("_Replace"),
                                                GTK_STOCK_PRINT,
                                                GTK_RESPONSE_ACCEPT);
+                  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                                           GTK_RESPONSE_ACCEPT,
+                                                           GTK_RESPONSE_CANCEL,
+                                                           -1);
                   gtk_dialog_set_default_response (GTK_DIALOG (dialog),
                                                    GTK_RESPONSE_ACCEPT);