gtk+ r19867 - in branches/gtk-2-12: . gtk

[neo svn gnome org]

Author: neo
Date: Thu Mar 13 14:10:09 2008
New Revision: 19867
URL: http://svn.gnome.org/viewvc/gtk+?rev=19867&view=rev

Log:
2008-03-13  Sven Neumann  <sven gimp org>

	Merged from trunk:

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


Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/gtk/gtkfilechooserdefault.c
   branches/gtk-2-12/gtk/gtkprintunixdialog.c

Modified: branches/gtk-2-12/gtk/gtkfilechooserdefault.c
==============================================================================
--- branches/gtk-2-12/gtk/gtkfilechooserdefault.c	(original)
+++ branches/gtk-2-12/gtk/gtkfilechooserdefault.c	Thu Mar 13 14:10:09 2008
@@ -8093,9 +8093,14 @@
 					    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));
 

Modified: branches/gtk-2-12/gtk/gtkprintunixdialog.c
==============================================================================
--- branches/gtk-2-12/gtk/gtkprintunixdialog.c	(original)
+++ branches/gtk-2-12/gtk/gtkprintunixdialog.c	Thu Mar 13 14:10:09 2008
@@ -365,6 +365,10 @@
                                                _("_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);