reenabled default_reply_to folder option
authorThorsten Maerz <torte@netztorte.de>
Tue, 5 Nov 2002 18:56:17 +0000 (18:56 +0000)
committerThorsten Maerz <torte@netztorte.de>
Tue, 5 Nov 2002 18:56:17 +0000 (18:56 +0000)
ChangeLog.claws
configure.in
src/compose.c

index 7b7d754..5652a2e 100644 (file)
@@ -1,3 +1,8 @@
+2002-11-05 [thorsten]  0.8.5claws75
+
+       * src/compose.c
+               reenabled default_reply_to folder option
+
 2002-11-05 [colin]     0.8.5claws74
 
        * src/compose.[ch] 
index 2fc71d2..5d1e8ff 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws74
+EXTRA_VERSION=claws75
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index 58c1bc9..9a67391 100644 (file)
@@ -1634,7 +1634,13 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
                        compose_entry_append(compose,
                                           compose->ml_post,
                                           COMPOSE_TO);
-               else
+               else if (!(to_all || ignore_replyto)
+                        && msginfo->folder
+                        && msginfo->folder->prefs->enable_default_reply_to) {
+                       compose_entry_append(compose,
+                           msginfo->folder->prefs->default_reply_to,
+                           COMPOSE_TO);
+               } else
                        compose_entry_append(compose,
                                 (compose->replyto && !ignore_replyto)
                                 ? compose->replyto