talons

commit d733e5e2c61c6db40de62c95b59cb6cdbac06b51
parent 657f6ad385f1dd6c41a7140263b708eea21608d2
Author: Colin Leroy <colin@colino.net>
Date:   Tue, 29 Dec 2009 10:17:46 +0000

2009-12-29 [colin]	3.7.3cvs46

	* src/compose.c
		Fix bug 2074, 'Remember sending account
		for sent messages'

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

4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-29 [colin]	3.7.3cvs46
+
+	* src/compose.c
+		Fix bug 2074, 'Remember sending account 
+		for sent messages'
+
 2009-12-20 [holger]	3.7.3cvs45
 
 	* src/compose.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3919,3 +3919,4 @@
 ( cvs diff -u -r 1.30.2.59 -r 1.30.2.60 src/prefs_toolbar.c;  cvs diff -u -r 1.5.2.8 -r 1.5.2.9 src/prefs_toolbar.h;  cvs diff -u -r 1.43.2.112 -r 1.43.2.113 src/toolbar.c;  ) > 3.7.3cvs43.patchset
 ( cvs diff -u -r 1.5.2.9 -r 1.5.2.10 src/prefs_toolbar.h;  ) > 3.7.3cvs44.patchset
 ( cvs diff -u -r 1.382.2.538 -r 1.382.2.539 src/compose.c;  ) > 3.7.3cvs45.patchset
+( cvs diff -u -r 1.382.2.539 -r 1.382.2.540 src/compose.c;  ) > 3.7.3cvs46.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=45
+EXTRA_VERSION=46
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/compose.c b/src/compose.c
@@ -2118,7 +2118,8 @@ Compose *compose_reedit(MsgInfo *msginfo, gboolean batch)
 	}
 
         if (folder_has_parent_of_type(msginfo->folder, F_QUEUE) ||
-	    folder_has_parent_of_type(msginfo->folder, F_DRAFT)) {
+	    folder_has_parent_of_type(msginfo->folder, F_DRAFT) ||
+	    folder_has_parent_of_type(msginfo->folder, F_OUTBOX)) {
 		gchar queueheader_buf[BUFFSIZE];
 		gint id, param;
 
@@ -2255,7 +2256,8 @@ Compose *compose_reedit(MsgInfo *msginfo, gboolean batch)
 	compose_extract_original_charset(compose);
 
         if (folder_has_parent_of_type(msginfo->folder, F_QUEUE) ||
-	    folder_has_parent_of_type(msginfo->folder, F_DRAFT)) {
+	    folder_has_parent_of_type(msginfo->folder, F_DRAFT) ||
+	    folder_has_parent_of_type(msginfo->folder, F_OUTBOX)) {
 		gchar queueheader_buf[BUFFSIZE];
 
 		/* Set message save folder */