Activate the Cancel button when Esc is pressed. (connectdialog_button):

2003-08-30  Jordi Mallach  <jordi@sindominio.net>

	* src/dialogs.c (teamdialog_new): Activate the Cancel button when
	Esc is pressed.
	(connectdialog_button): Likewise.
	(connectdialog_new): Likewise.
	(prefdialog_new): Don't make the Close button the default action.
	Patches from Dagfinn Ilmari Mannsåker. Thanks!

diff --git a/ChangeLog b/ChangeLog
index 70c292fa1964eac09d48cecaafa3b52b04f3698a..2fb05013bf18d8bf3cb0a402852d6966ae747434 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-08-30  Jordi Mallach  <jordi@sindominio.net>
+
+       * src/dialogs.c (teamdialog_new): Activate the Cancel button when
+       Esc is pressed.
+       (connectdialog_button): Likewise.
+       (connectdialog_new): Likewise.
+       (prefdialog_new): Don't make the Close button the default action.
+       Patches from Dagfinn Ilmari Mannsåker. Thanks!
+
 2003-08-29  Dani Carbonell  <bocata@panete.net>
 
        * src/gtetrinet.c (keypress): fixing the key press signal handling

diff --git a/src/dialogs.c b/src/dialogs.c
index 3eb2f149fde9fc6d9c98d4ff07111f62eb9db75b..94ad6bf13d3a73cc657c3e95aff0427a034fcda7 100644 (file)
--- a/src/dialogs.c
+++ b/src/dialogs.c
@@ -156,7 +156,7 @@ void teamdialog_new (void)
     team_dialog = gtk_dialog_new_with_buttons (_("Change team"),
                                                GTK_WINDOW (app),
                                                GTK_DIALOG_NO_SEPARATOR,
-                                               GTK_STOCK_CANCEL, GTK_RESPONSE_CLOSE,
+                                               GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                                                GTK_STOCK_OK, GTK_RESPONSE_OK,
                                                NULL);
     gtk_window_set_skip_taskbar_hint (GTK_WINDOW (team_dialog), TRUE);
@@ -269,7 +269,7 @@ void connectdialog_button (GtkDialog *dialog, gint button)
         g_free (team_utf8);
         g_free (nick);
         break;
-    case GTK_RESPONSE_CLOSE:
+    case GTK_RESPONSE_CANCEL:
         gamemode = oldgamemode;
         gtk_widget_destroy (connectdialog);
         break;
@@ -335,7 +335,7 @@ void connectdialog_new (void)
     connectdialog = gtk_dialog_new_with_buttons (_("Connect to server"),
                                                  GTK_WINDOW (app),
                                                  GTK_DIALOG_NO_SEPARATOR,
-                                                 GTK_STOCK_CANCEL, GTK_RESPONSE_CLOSE,
+                                                 GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                                                  GTK_STOCK_OK, GTK_RESPONSE_OK,
                                                  NULL);
     gtk_dialog_set_default_response (GTK_DIALOG (connectdialog), GTK_RESPONSE_OK);
@@ -847,7 +847,6 @@ void prefdialog_new (void)
                                               GTK_STOCK_HELP, GTK_RESPONSE_HELP,
                                               GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
                                               NULL);
-    gtk_dialog_set_default_response (GTK_DIALOG (prefdialog), GTK_RESPONSE_CLOSE);
     notebook = gtk_notebook_new ();
     gtk_window_set_resizable (GTK_WINDOW (prefdialog), FALSE);