updated for version 7.1-069

diff --git a/src/gui_gtk.c b/src/gui_gtk.c
index 094769d4b9065ce49f4ed988daa8fbe5848fa112..cfba5c7647760ae3c57acbcfb68417674ed84296 100644 (file)
--- a/src/gui_gtk.c
+++ b/src/gui_gtk.c
@@ -1630,11 +1630,14 @@ dlg_button_clicked(GtkWidget * widget, ButtonData *data)
  */
 /*ARGSUSED*/
     static int
-dlg_key_press_event(GtkWidget * widget, GdkEventKey * event, CancelData *data)
+dlg_key_press_event(GtkWidget *widget, GdkEventKey *event, CancelData *data)
 {
-    /* Ignore hitting Enter when there is no default button. */
-    if (data->ignore_enter && event->keyval == GDK_Return)
+    /* Ignore hitting Enter (or Space) when there is no default button. */
+    if (data->ignore_enter && (event->keyval == GDK_Return
+                                                    || event->keyval == ' '))
        return TRUE;
+    else    /* A different key was pressed, return to normal behavior */
+       data->ignore_enter = FALSE;
 
     if (event->keyval != GDK_Escape && event->keyval != GDK_Return)
        return FALSE;
@@ -2224,6 +2227,13 @@ dialog_key_press_event_cb(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
     DialogInfo *di = (DialogInfo *)data;
 
+    /* Ignore hitting Enter (or Space) when there is no default button. */
+    if (di->ignore_enter && (event->keyval == GDK_Return
+                                                    || event->keyval == ' '))
+       return TRUE;
+    else    /* A different key was pressed, return to normal behavior */
+       di->ignore_enter = FALSE;
+
     /* Close the dialog when hitting "Esc". */
     if (event->keyval == GDK_Escape)
     {

diff --git a/src/version.c b/src/version.c
index fb80f28fcb156039c4f2b5aa874f27fb779d26a1..fce1bcd28c821cd34a0eb67a11b783339bf806dc 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    69,
 /**/
     68,
 /**/