From: Michael Rasmussen <mir@datanom.net>
Date: Wed, 9 Dec 2009 00:51:49 +0000 (+0000)
Subject: 2009-12-09 [mir]	3.7.3cvs35
X-Git-Tag: rel_3_7_4~24
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=27646e8b7fb5c790b1810139361a11d8cc9010fa

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 7b5ba0c69..5685d0ad7 100644
--- 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 58d4155a3..77c37ada5 100644
--- 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 b957f11ee..e678df95b 100644
--- 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 18950822f..56b990d19 100644
--- 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;