gnome-terminal r3389 - trunk/src

[chpe svn gnome org]

Author: chpe
Date: Wed Mar 25 12:48:11 2009
New Revision: 3389
URL: http://svn.gnome.org/viewvc/gnome-terminal?rev=3389&view=rev

Log:
Make sure each dialogue sets its alternative button order.

Modified:
   trunk/src/skey-popup.c
   trunk/src/terminal-app.c
   trunk/src/terminal-window.c

Modified: trunk/src/skey-popup.c
==============================================================================
--- trunk/src/skey-popup.c	(original)
+++ trunk/src/skey-popup.c	Wed Mar 25 12:48:11 2009
@@ -205,6 +205,11 @@
   gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
   gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
 
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_OK,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
   /* FIXME: make this dialogue close if the screen closes! */
 
   data = g_new (SkeyData, 1);

Modified: trunk/src/terminal-app.c
==============================================================================
--- trunk/src/terminal-app.c	(original)
+++ trunk/src/terminal-app.c	Wed Mar 25 12:48:11 2009
@@ -1104,6 +1104,7 @@
                                                    GTK_MESSAGE_QUESTION,
                                                    GTK_BUTTONS_YES_NO,
                                                    _("You already have a profile called â%sâ. Do you want to create another profile with the same name?"), name);
+          /* Alternative button order was set automatically by GtkMessageDialog */
           retval = gtk_dialog_run (GTK_DIALOG (confirm_dialog));
           gtk_widget_destroy (confirm_dialog);
           if (retval == GTK_RESPONSE_NO)
@@ -1208,6 +1209,10 @@
 
       gtk_label_set_mnemonic_widget (GTK_LABEL (base_label), combo);
 
+      gtk_dialog_set_alternative_button_order (GTK_DIALOG (app->new_profile_dialog),
+                                               GTK_RESPONSE_ACCEPT,
+                                               GTK_RESPONSE_CANCEL,
+                                               -1);
       gtk_dialog_set_default_response (GTK_DIALOG (app->new_profile_dialog), GTK_RESPONSE_ACCEPT);
       gtk_dialog_set_response_sensitive (GTK_DIALOG (app->new_profile_dialog), GTK_RESPONSE_ACCEPT, FALSE);
     }

Modified: trunk/src/terminal-window.c
==============================================================================
--- trunk/src/terminal-window.c	(original)
+++ trunk/src/terminal-window.c	Wed Mar 25 12:48:11 2009
@@ -2916,6 +2916,11 @@
   gtk_dialog_add_button (GTK_DIALOG (dialog), n_tabs > 1 ? _("_Close Window") : _("_Close Terminal"), GTK_RESPONSE_ACCEPT);
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
 
+  gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
+                                           GTK_RESPONSE_ACCEPT,
+                                           GTK_RESPONSE_CANCEL,
+                                           -1);
+
   g_object_set_data (G_OBJECT (dialog), "close-screen", screen);
 
   g_signal_connect (dialog, "destroy",
@@ -3263,6 +3268,7 @@
   gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
   gtk_window_set_role (GTK_WINDOW (dialog), "gnome-terminal-change-title");
   gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+  /* Alternative button order was set automatically by GtkMessageDialog */
 
   g_signal_connect (dialog, "response",
                     G_CALLBACK (terminal_set_title_dialog_response_cb), priv->active_screen);