talons

commit 3ec0c524db80c783f66fb9e1c6f4244ac1ff0112
parent 045c687dd3f985ae67af9b50efe4d223e60a609e
Author: Salvatore De Paolis <iwkse@claws-mail.org>
Date:   Sat,  6 Jun 2009 00:17:45 +0000

2009-06-06 [iwkse]	3.7.1cvs69

	* src/compose.c
		Fix shutting down of Claws Mail while a GTK_Return keypress
		event is sent to the Attach property window

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

4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-06 [iwkse]	3.7.1cvs69
+
+	* src/compose.c
+		Fix shutting down of Claws Mail while a GTK_Return keypress 
+		event is sent to the Attach property window
+
 2009-06-05 [colin]	3.7.1cvs68
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3808,3 +3808,4 @@
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 tools/make.themes.project;  ) > 3.7.1cvs66.patchset
 ( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 tools/make.themes.project;  ) > 3.7.1cvs67.patchset
 ( cvs diff -u -r 1.382.2.513 -r 1.382.2.514 src/compose.c;  ) > 3.7.1cvs68.patchset
+( cvs diff -u -r 1.382.2.514 -r 1.382.2.515 src/compose.c;  ) > 3.7.1cvs69.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=68
+EXTRA_VERSION=69
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/compose.c b/src/compose.c
@@ -8552,10 +8552,6 @@ 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;
 }