talons

commit e48b456e6c48b877bfed185e9149e5959ab3a318
parent ebf6540cd31ce24585dd9bf72d3d4a4b790e787c
Author: Paul Mangan <paul@claws-mail.org>
Date:   Sat, 22 Nov 2008 10:38:24 +0000

2008-11-22 [paul]	3.6.1cvs41

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

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/compose.c
 | 
4
++++

4 files changed, 12 insertions(+), 1 deletion(-)
diff --git 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
@@ -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
@@ -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
@@ -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;
 }