* src/filtering.c

	make filtering's forward message action forward from the
	correct account
	(closes bug [628089 ] Filter -> Forward from address problem
	reported by Oktay)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 11bbfc26a7fed3d5b1a6d282a03ef9135b1c5edd..d4ee69c954482275035a8b7589bbd72c30e89916 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,11 @@
+2002-10-24 [alfons]    0.8.5claws53
+
+       * src/filtering.c
+               make filtering's forward message action forward from the 
+               correct account
+               (closes bug [628089 ] Filter -> Forward from address problem
+               reported by Oktay)
+

 2002-10-24 [christoph] 0.8.5claws52
 
        * src/mainwindow.c
 2002-10-24 [christoph] 0.8.5claws52
 
        * src/mainwindow.c

diff --git a/configure.in b/configure.in
index a552fc5fe75625a5fa918c8c6fbbcebd1a460dd0..37c4d09a89dbd100765f0336dd86e7bd46056d04 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws52
+EXTRA_VERSION=claws53

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/compose.c b/src/compose.c
index 29297654db253e24a0863df0f4970b2e8ed06243..d7fb48cd7748e6ffc658199f890062ca0df6938b 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -954,13 +954,13 @@ Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
                         gboolean as_attach, const gchar *body)
 {
        Compose *compose;
                         gboolean as_attach, const gchar *body)
 {
        Compose *compose;

-       /*      PrefsAccount *account; */

        GtkSText *text;
 
        g_return_val_if_fail(msginfo != NULL, NULL);
        g_return_val_if_fail(msginfo->folder != NULL, NULL);
 
        GtkSText *text;
 
        g_return_val_if_fail(msginfo != NULL, NULL);
        g_return_val_if_fail(msginfo->folder != NULL, NULL);
 

-       account = msginfo->folder->folder->account;
+       if (!account) 
+               account = msginfo->folder->folder->account;

        if (!account && msginfo->to && prefs_common.forward_account_autosel) {
                gchar *to;
                Xstrdup_a(to, msginfo->to, return NULL);
        if (!account && msginfo->to && prefs_common.forward_account_autosel) {
                gchar *to;
                Xstrdup_a(to, msginfo->to, return NULL);