From: Paul Mangan <paul@claws-mail.org>
Date: Wed, 23 Jul 2003 06:34:05 +0000 (+0000)
Subject: Redirect fixes: enable automatic account selection and do not append signature to... 
X-Git-Tag: rel_0_9_4~71
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=e7ecc0146d7a04e5d64e14408625b12cb12f409b

Redirect fixes: enable automatic account selection and do not append signature to message on changing account
---

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 03010e981..b27254c4b 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2003-07-23 [paul]	0.9.3claws42
+
+	* src/compose.c
+		Redirect fixes: enable automatic account selection and
+		do not append signature to message on changing account
+		fixes Bug[s] #248
+
 2003-07-23 [paul]	0.9.3claws41
 
 	* sync with 0.9.3cvs16
diff --git a/configure.ac b/configure.ac
index 3653a22df..06a700b91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=41
+EXTRA_VERSION=42
 VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws${EXTRA_VERSION}
 
 dnl set $target
diff --git a/src/compose.c b/src/compose.c
index 732385356..0e639c39b 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -1286,7 +1286,8 @@ Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo)
 	g_return_val_if_fail(msginfo != NULL, NULL);
 
 	if (!account)
- 		account = cur_account;
+		account = account_get_reply_account(msginfo,
+					prefs_common.reply_account_autosel);
 	g_return_val_if_fail(account != NULL, NULL);
 
 	compose = compose_create(account, COMPOSE_REDIRECT);
@@ -2902,7 +2903,7 @@ static void compose_select_account(Compose *compose, PrefsAccount *account,
 	activate_gnupg_mode(compose, account);		
 #endif /* USE_GPGME */
 
-	if (!init)
+	if (!init && compose->mode != COMPOSE_REDIRECT)
 		compose_insert_sig(compose, TRUE);
 }