2007-06-15 [colin] 2.9.2cvs61

	* src/action.c
	* src/addr_compl.c
	* src/addressbook.c
	* src/folderview.c
	* src/message_search.c
	* src/mimeview.c
	* src/summary_search.c
	* src/summaryview.c
	* src/textview.c
		Allow GDK_KP_Enter to do the same as GDK_Return
		Patch by Michael Rasmussen

diff --git a/ChangeLog b/ChangeLog
index 1e93b6ec927290b51361f220cf82e37562c5a47d..4d9fb3ca30b9f947ee0ad26380c53f58142e1a5f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2007-06-15 [colin]     2.9.2cvs61
+
+       * src/action.c
+       * src/addr_compl.c
+       * src/addressbook.c
+       * src/folderview.c
+       * src/message_search.c
+       * src/mimeview.c
+       * src/summary_search.c
+       * src/summaryview.c
+       * src/textview.c
+               Allow GDK_KP_Enter to do the same as GDK_Return
+               Patch by Michael Rasmussen
+
 2007-06-15 [paul]      2.9.2cvs60
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index e60eea28599ca9c48d4d40f3fe72a8b4d14f80f9..e34adc7eae4d6af904a7a88dad0ed8b181a83d8b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2636,3 +2636,4 @@
 ( cvs diff -u -r 1.5.2.47 -r 1.5.2.48 src/gtk/pluginwindow.c;  ) > 2.9.2cvs58.patchset
 ( cvs diff -u -r 1.115.2.154 -r 1.115.2.155 src/main.c;  cvs diff -u -r 1.9.2.37 -r 1.9.2.38 src/common/defs.h;  ) > 2.9.2cvs59.patchset
 ( cvs diff -u -r 1.382.2.389 -r 1.382.2.390 src/compose.c;  ) > 2.9.2cvs60.patchset
+( cvs diff -u -r 1.12.2.45 -r 1.12.2.46 src/action.c;  cvs diff -u -r 1.27.2.35 -r 1.27.2.36 src/addr_compl.c;  cvs diff -u -r 1.60.2.90 -r 1.60.2.91 src/addressbook.c;  cvs diff -u -r 1.207.2.164 -r 1.207.2.165 src/folderview.c;  cvs diff -u -r 1.3.12.28 -r 1.3.12.29 src/message_search.c;  cvs diff -u -r 1.83.2.106 -r 1.83.2.107 src/mimeview.c;  cvs diff -u -r 1.15.2.49 -r 1.15.2.50 src/summary_search.c;  cvs diff -u -r 1.395.2.304 -r 1.395.2.305 src/summaryview.c;  cvs diff -u -r 1.96.2.172 -r 1.96.2.173 src/textview.c;  ) > 2.9.2cvs61.patchset

diff --git a/configure.ac b/configure.ac
index ca3efe19c4cda19623aff45199a1948fa0d01ad2..ff08f9e30e223d0355c9026f274f8e2ea3f53c69 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=60
+EXTRA_VERSION=61
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/action.c b/src/action.c
index 96d5bda7d0bb66c6bc404ebf4de35bab4fb451c1..f27909be1ef879ff9af398ea6c655df0b3774063 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -1083,7 +1083,8 @@ static gint io_dialog_key_pressed_cb(GtkWidget *widget, GdkEventKey *event,
                                     gpointer data)
 {
        if (event && (event->keyval == GDK_Escape ||
-                     event->keyval == GDK_Return))
+                     event->keyval == GDK_Return ||
+                         event->keyval == GDK_KP_Enter))
                hide_io_dialog_cb(widget, data);
        return TRUE;
 }

diff --git a/src/addr_compl.c b/src/addr_compl.c
index f7687ccfe528b66e1c3c1c9fb18596c313f16db0..ba80587486a2c7ac25c215871a0f2fb726ae567d 100644 (file)
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -1502,8 +1502,9 @@ static gboolean completion_window_key_press(GtkWidget *widget,
        _allowCommas_ = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(entry), ENTRY_DATA_ALLOW_COMMAS));
 
        /* look for presses that accept the selection */
-       if (event->keyval == GDK_Return || event->keyval == GDK_space
-                       || (_allowCommas_ && event->keyval == GDK_comma)) {
+       if (event->keyval == GDK_Return || event->keyval == GDK_space ||
+                       event->keyval == GDK_KP_Enter ||
+                       (_allowCommas_ && event->keyval == GDK_comma)) {
                /* User selected address with a key press */
 
                /* Display selected address in entry field */           

diff --git a/src/addressbook.c b/src/addressbook.c
index 8a1267a5b5d1ddfbc0c6931da336d4dc8b9ac941..c757efab614e7f2fd12bdf1575a806bfb8e4fd12 100644 (file)
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -4123,7 +4123,7 @@ void addressbook_export_to_file( void ) {
 
 static gboolean addressbook_entry_key_pressed(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
-       if (event && event->keyval == GDK_Return)
+       if (event && (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter))
                addressbook_lup_clicked(NULL, NULL);
        return FALSE;
 }

diff --git a/src/folderview.c b/src/folderview.c
index f53d945acb253299f96b28512597cefe267f134f..c4efce15d638792b489a65d3d3e7e2c544cff3a6 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -2008,6 +2008,7 @@ static gboolean folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
        case GDK_Right:
 #ifndef MAEMO
        case GDK_Return:
+       case GDK_KP_Enter:
 #endif
                if (folderview->selected) {
                        folderview_select_node(folderview,

diff --git a/src/message_search.c b/src/message_search.c
index b433fbe22e4c220219c819fdefba9294b0d7fa31..d713667066e825f24b331d23654a1ceab7965c2c 100644 (file)
--- a/src/message_search.c
+++ b/src/message_search.c
@@ -397,7 +397,7 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
                gtk_widget_hide(search_window.window);
        }
 
-       if (event && (event->keyval == GDK_Return)) {
+       if (event && (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter)) {
                message_search_execute(FALSE);
        }
 

diff --git a/src/mimeview.c b/src/mimeview.c
index 246872007156631de8ef35f221aa02100e2d5abb..cadfd849e7526acf0c5ec71d879f85dda988caee 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -1308,6 +1308,7 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                mimeview_scroll_page(mimeview, TRUE);
                return TRUE;
        case GDK_Return:
+       case GDK_KP_Enter:
                mimeview_scroll_one_line(mimeview,
                                         (event->state & GDK_MOD1_MASK) != 0);
                return TRUE;
@@ -1948,6 +1949,7 @@ static gint icon_key_pressed(GtkWidget *button, GdkEventKey *event,
                mimeview_scroll_page(mimeview, TRUE);
                return TRUE;
        case GDK_Return:
+       case GDK_KP_Enter:
                if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
                        KEY_PRESS_EVENT_STOP();
                        mimeview_scroll_one_line(mimeview,

diff --git a/src/summary_search.c b/src/summary_search.c
index 65830f585361c56f38fe6a2eeea90030ee38716c..f055b4c958ef7c17781e8189d54c2d96d441e5ec 100644 (file)
--- a/src/summary_search.c
+++ b/src/summary_search.c
@@ -996,7 +996,7 @@ static gboolean key_pressed(GtkWidget *widget, GdkEventKey *event,
                }
        }
 
-       if (event && (event->keyval == GDK_Return)) {
+       if (event && (event->keyval == GDK_Return || event->keyval == GDK_KP_Enter)) {
                if (!search_window.is_searching) {
                        summary_search_execute(FALSE, FALSE);
                }

diff --git a/src/summaryview.c b/src/summaryview.c
index 554a5c827b5acb02fcec31dbc49f469359c7b844..cfabad9a5b5edec1226e1c79869a3d941be48da9 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -5491,6 +5491,7 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                        mimeview_scroll_page(messageview->mimeview, TRUE);
                        break;
                case GDK_Return:        /* Scroll up/down one line */
+               case GDK_KP_Enter:
                        handled = TRUE;
                        if (summaryview->displayed != summaryview->selected) {
                                summary_display_msg(summaryview,

diff --git a/src/textview.c b/src/textview.c
index 66478ca6da7e6243608e008a7dd25125c6e19f5b..70ba0364b70dc8208e96c64d1940ecf8e00dc47d 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -2000,6 +2000,7 @@ static gint textview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                mimeview_scroll_page(messageview->mimeview, TRUE);
                break;
        case GDK_Return:
+       case GDK_KP_Enter:
                mimeview_scroll_one_line
                        (messageview->mimeview, (event->state &
                                    (GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0);