2008-11-22 [paul] 3.6.1cvs41

	* src/compose.c
		grab Return key press in attachments Properties
		dialog

diff --git a/ChangeLog b/ChangeLog
index 147d4b8fe7777dd89d70058bc869b4b8aa306354..d93add58965de1205be4e9b05784e6acbd1fc5e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-22 [paul]      3.6.1cvs41
+
+       * src/compose.c
+               grab Return key press in attachments Properties
+               dialog
+
 2008-11-21 [colin]     3.6.1cvs40
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index f021f7788a09b019763b6c140ea22496bb524918..b449ebdf19bb35ccd455c17d543c95b940feb7a5 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3622,3 +3622,4 @@
 ( cvs diff -u -r 1.20.2.27 -r 1.20.2.28 src/mimeview.h;  cvs diff -u -r 1.19.2.29 -r 1.19.2.30 src/toolbar.h;  cvs diff -u -r 1.8.2.14 -r 1.8.2.15 src/common/session.h;  cvs diff -u -r 1.6.2.15 -r 1.6.2.16 src/common/smtp.h;  ) > 3.6.1cvs38.patchset
 ( cvs diff -u -r 1.13.2.41 -r 1.13.2.42 src/common/socket.c;  ) > 3.6.1cvs39.patchset
 ( cvs diff -u -r 1.382.2.486 -r 1.382.2.487 src/compose.c;  cvs diff -u -r 1.49.2.120 -r 1.49.2.121 src/procmime.c;  ) > 3.6.1cvs40.patchset
+( cvs diff -u -r 1.382.2.487 -r 1.382.2.488 src/compose.c;  ) > 3.6.1cvs41.patchset

diff --git a/configure.ac b/configure.ac
index 62b0caf6059384955da9c04968049c1df3b8cbb1..f93b42d9d3f08dfc564fe8ec999f11477002fa42 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=40
+EXTRA_VERSION=41
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 1ce4e3e2662a4ade6623ef2cf179a01b581cd608..89a45cfbdd67963d01a8c1c80f7273afcd3475d3 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -8371,6 +8371,10 @@ static gboolean attach_property_key_pressed(GtkWidget *widget,
                *cancelled = TRUE;
                gtk_main_quit();
        }
+       if (event && event->keyval == GDK_Return) {
+               *cancelled = FALSE;
+               gtk_main_quit();
+       }
        return FALSE;
 }