From: Salvatore De Paolis <iwkse@claws-mail.org>
Date: Sat, 6 Jun 2009 08:44:38 +0000 (+0000)
Subject: 2009-06-06 [iwkse]	3.7.1cvs70
X-Git-Tag: rel_3_7_2~17
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=44aa899f97edf93e067ed54fa676a2759156bb6f

2009-06-06 [iwkse]	3.7.1cvs70

	* src/compose.c
		A better fix for the previous commit's issue
---

diff --git a/ChangeLog b/ChangeLog
index c2823477b..99777200f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-06 [iwkse]	3.7.1cvs70
+
+	* src/compose.c
+		A better fix for the previous commit's issue
+
 2009-06-06 [iwkse]	3.7.1cvs69
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
index 59536c045..5757a8371 100644
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3809,3 +3809,4 @@
 ( 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
+( cvs diff -u -r 1.382.2.515 -r 1.382.2.516 src/compose.c;  ) > 3.7.1cvs70.patchset
diff --git a/configure.ac b/configure.ac
index df0e5687c..cd99f701d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=69
+EXTRA_VERSION=70
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/compose.c b/src/compose.c
index c5c052517..0a445fd25 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -205,9 +205,6 @@ static GtkWidget *compose_account_option_menu_create
 						(Compose	*compose);
 static void compose_set_out_encoding		(Compose	*compose);
 static void compose_set_template_menu		(Compose	*compose);
-static void compose_template_apply		(Compose	*compose,
-						 Template	*tmpl,
-						 gboolean	 replace);
 static void compose_destroy			(Compose	*compose);
 
 static void compose_entries_set			(Compose	*compose,
@@ -7888,7 +7885,7 @@ static const gchar *compose_quote_char_from_context(Compose *compose)
 	return qmark;
 }
 
-static void compose_template_apply(Compose *compose, Template *tmpl,
+void compose_template_apply(Compose *compose, Template *tmpl,
 				   gboolean replace)
 {
 	GtkTextView *text;
@@ -8552,6 +8549,11 @@ 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 TRUE;
+	}
 	return FALSE;
 }