reenabled default_reply_to folder option

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 7b7d75443fe01d3c3e7b09b66e5ca5f2c623d71b..5652a2e0cbf7d0b97a210542e4017a5e50e0d6e8 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -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] 
 2002-11-05 [colin]     0.8.5claws74
 
        * src/compose.[ch] 

diff --git a/configure.in b/configure.in
index 2fc71d2c2f2ea7a89d5f573fdfbe6e3f43aa099e..5d1e8ff14adb31562e8ff50a972a447a6b896767 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=claws74
+EXTRA_VERSION=claws75

 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 58c1bc9e524b12dfcd537a886f1148e5672f2f7f..9a67391e2a4de12d3de18887e5190138691a5ba8 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1634,7 +1634,13 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
                        compose_entry_append(compose,
                                           compose->ml_post,
                                           COMPOSE_TO);
                        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
                        compose_entry_append(compose,
                                 (compose->replyto && !ignore_replyto)
                                 ? compose->replyto