fix default account selection when forwarding
authorColin Leroy <colin@colino.net>
Thu, 14 Nov 2002 16:45:07 +0000 (16:45 +0000)
committerColin Leroy <colin@colino.net>
Thu, 14 Nov 2002 16:45:07 +0000 (16:45 +0000)
ChangeLog.claws
configure.in
src/compose.c

index b7aa64a..038da84 100644 (file)
@@ -1,3 +1,8 @@
+2002-11-14 [colin]     0.8.5claws149
+
+       * src/compose.c
+               Forwarding was also ignoring the folder's default account.
+
 2002-11-14 [colin]     0.8.5claws148
 
        * src/compose.c
index 66095cd..9ecae07 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws148
+EXTRA_VERSION=claws149
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index ec6f04b..18db192 100644 (file)
@@ -967,6 +967,8 @@ Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
        g_return_val_if_fail(msginfo != NULL, NULL);
        g_return_val_if_fail(msginfo->folder != NULL, NULL);
 
+       if (msginfo->folder->prefs->enable_default_account)
+               account = account_find_from_id(msginfo->folder->prefs->default_account);
        if (!account) 
                account = msginfo->folder->folder->account;
        if (!account && msginfo->to && prefs_common.forward_account_autosel) {