fixed bug #486106 to select correct account when reediting a queued message

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 1ce2faf19ee0d958c58cf83c2bf8dd3b22b5af99..5f62c59a81f8d4ca6450c3a833817d01e8c73734 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2001-12-05 [melvin]    0.6.5claws51
+
+       * src/compose.c
+               fixed bug #486106 to select correct account when reediting 
+               a queued message
+       
 2001-12-04 [alfons]    0.6.5claws50
 
        * src/mh.c

diff --git a/configure.in b/configure.in
index 0182ed49cc221abb35bdb4efa8d39c6787a8e8b1..e4332eb26c1405a6cbc14def6bdadb51d2aff996 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=6
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws50
+EXTRA_VERSION=claws51
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl

diff --git a/src/compose.c b/src/compose.c
index 9db8e5af34d93e2f0e38e705f552bf3d58ee1a55..a5291e55fb28f49f5ec9ad5abf27d1c2f042f651 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1161,11 +1161,17 @@ void compose_reedit(MsgInfo *msginfo)
        g_return_if_fail(msginfo != NULL);
        g_return_if_fail(msginfo->folder != NULL);
 
-        account = msginfo->folder->folder->account;
+        if (msginfo->folder->stype == F_QUEUE) {
+               gchar account_address[BUFFSIZE];
+               if (!get_header_from_msginfo(msginfo, account_address, sizeof(account_address), "S:")) {
+                       account = account_find_from_address(account_address);
+               }
+       } else 
+               account = msginfo->folder->folder->account;
 
-        if(!account&& prefs_common.reedit_account_autosel) {
+       if (!account && prefs_common.reedit_account_autosel) {
                        gchar from[BUFFSIZE];
-               if(!get_header_from_msginfo(msginfo,from,sizeof(from),"FROM:")){ /* Found a FROM header */
+               if (!get_header_from_msginfo(msginfo, from, sizeof(from), "FROM:")){
                        extract_address(from);
                        account = account_find_from_address(from);
                 }