2009-06-06 [iwkse] 3.7.1cvs70
authorSalvatore De Paolis <iwkse@claws-mail.org>
Sat, 6 Jun 2009 08:44:38 +0000 (08:44 +0000)
committerSalvatore De Paolis <iwkse@claws-mail.org>
Sat, 6 Jun 2009 08:44:38 +0000 (08:44 +0000)
* src/compose.c
A better fix for the previous commit's issue

ChangeLog
PATCHSETS
configure.ac
src/compose.c

index c2823477b8fc258caa366f98eb4b478334b094de..99777200f2b357d10a4d60aefbfa1b8978743e1f 100644 (file)
--- 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
index 59536c045c3349443a6af5e9d08823a9941624e0..5757a8371ebb29cef862ba1a81fefa7cd9bc019f 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index df0e5687c305e91411d7e20fc0448223f44b6c28..cd99f701d62581a5542cabc92abaddf3819c8a65 100644 (file)
@@ -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=
 
index c5c052517113ef234bb10e59cbe202c4208faf58..0a445fd2502f32cfb8df1406474ebd17b6f403ea 100644 (file)
@@ -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;
 }