2009-12-09 [mir] 3.7.3cvs35

	* src/compose.c
	Fix Bug 2072 "template at folder properties is not working"
	introduced in cvs24.

diff --git a/ChangeLog b/ChangeLog
index 7b5ba0c69f6903e2e8c2610c32a9340c00c149a3..5685d0ad7ec6a83edc2b999a78b0b115ae1b10bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-09 [mir]       3.7.3cvs35
+
+       * src/compose.c
+       Fix Bug 2072 "template at folder properties is not working"
+       introduced in cvs24.
+
 2009-12-08 [pawel]     3.7.3cvs34
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 58d4155a3bd338d75cebccfd96c7b56deefa86a4..77c37ada5f994a8c029fdcf686e02064f30f176b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3908,3 +3908,4 @@
 ( cvs diff -u -r 1.94.2.205 -r 1.94.2.206 src/messageview.c;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/uri_opener.c;  ) > 3.7.3cvs32.patchset
 ( cvs diff -u -r 1.94.2.206 -r 1.94.2.207 src/messageview.c;  ) > 3.7.3cvs33.patchset
 ( cvs diff -u -r 1.382.2.531 -r 1.382.2.532 src/compose.c;  ) > 3.7.3cvs34.patchset
+( cvs diff -u -r 1.382.2.532 -r 1.382.2.533 src/compose.c;  ) > 3.7.3cvs35.patchset

diff --git a/configure.ac b/configure.ac
index b957f11eefffab85e9ba384e5ffae5891efaceb4..e678df95ba4bbe7e95f620e40531ace00f31ef62 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=34
+EXTRA_VERSION=35
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 18950822f9454ce511978e9215d9d91c64e3fea9..56b990d1973ee1b5ed38c79d9884bf40a0d3c743 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1115,6 +1115,7 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
 
                        g_free(subject);
                        g_free(tmp);
+                       mfield = SUBJECT_FIELD_PRESENT;
                }
 
                if ( body_format
@@ -1146,6 +1147,7 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
                        if (compose->gtkaspell->check_while_typing)
                                gtkaspell_highlight_all(compose->gtkaspell);
 #endif
+                       mfield = BODY_FIELD_PRESENT;
                }
 
        }
@@ -1179,7 +1181,11 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
                        gtk_widget_grab_focus(compose->header_last->entry);
                        break;
                case TO_FIELD_PRESENT:
-                       buf = g_strdup("");
+                       buf = gtk_editable_get_chars(GTK_EDITABLE(compose->subject_entry), 0, -1);
+                       /*
+                        * buf will always contain an allocated string,
+                        * either empty or populated with some text
+                        */
                        gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), buf);     
                        gtk_widget_grab_focus(compose->subject_entry);
                        break;