* src/compose.c
authorAlfons Hoogervorst <alfons@proteus.demon.nl>
Fri, 18 Oct 2002 20:49:03 +0000 (20:49 +0000)
committerAlfons Hoogervorst <alfons@proteus.demon.nl>
Fri, 18 Oct 2002 20:49:03 +0000 (20:49 +0000)
make automagic reply work correctly for email accounts
(whether it's viable to do a full sync with Hiro's
compose.c is still under discussion)

ChangeLog.claws
configure.in
src/compose.c

index 1d4f86f7f4c378d44d02393c3bd1387e1f155cec..1f69f92cc834defc41d6fa0b48b4022fadf5bb25 100644 (file)
@@ -1,3 +1,10 @@
+2002-10-18 [alfons]    0.8.5claws46
+
+       * src/compose.c
+               make automagic reply work correctly for email accounts 
+               (whether it's viable to do a full sync with Hiro's 
+               compose.c is still under discussion)
+
 2002-10-18 [melvin]    0.8.5claws45
 
        * src/prefs_actions.c
index 9e42fda56fe2fc351ec2b8ac94c5f6220d098ddb..e5a789b747ae4d280c3ab6b6e1d5e7e50f4f890b 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws45
+EXTRA_VERSION=claws46
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
index a81e1895c74288da73291ccecc49e243bacef51a..29297654db253e24a0863df0f4970b2e8ed06243 100644 (file)
@@ -1470,6 +1470,7 @@ static gint compose_parse_header(Compose *compose, MsgInfo *msginfo)
                hentry[H_LIST_POST].body = NULL;
        }
 
+       /* CLAWS - X-Priority */
        if (compose->mode == COMPOSE_REEDIT)
                if (hentry[H_X_PRIORITY].body != NULL) {
                        gint priority;
@@ -1628,29 +1629,24 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
        g_return_if_fail(compose->account != NULL);
        g_return_if_fail(msginfo != NULL);
 
-       if (to_ml && compose->ml_post) {
-               compose_entry_append(compose, compose->ml_post,
-                                    COMPOSE_TO);
-       } else if ((compose->account->protocol != A_NNTP) || followup_and_reply_to) {
-               if (!(to_all || ignore_replyto)
-                   && msginfo->folder
-                   && msginfo->folder->prefs->enable_default_reply_to) {
+       if (compose->account->protocol != A_NNTP || followup_and_reply_to) {
+               if (!compose->replyto && to_ml && compose->ml_post)
                        compose_entry_append(compose,
-                           msginfo->folder->prefs->default_reply_to,
-                           COMPOSE_TO);
-               else
+                                          compose->ml_post,
+                                          COMPOSE_TO);
+               else
                        compose_entry_append(compose,
-                                   ((compose->replyto && !ignore_replyto)
-                                    ? compose->replyto
-                                    : msginfo->from ? msginfo->from : ""),
-                                    COMPOSE_TO);
+                                (compose->replyto && !ignore_replyto)
+                                ? compose->replyto
+                                : msginfo->from ? msginfo->from : "",
+                                COMPOSE_TO);
        } else {
                if (ignore_replyto)
                        compose_entry_append
                                (compose, msginfo->from ? msginfo->from : "",
                                 COMPOSE_TO);
                else {
-                       if (compose->followup_to && !strncmp(compose->followup_to,"poster",6)) {
+                       if (compose->followup_to && !strncmp(compose->followup_to, "poster", 6)) {
                                compose_entry_append
                                        (compose,
                                        ((compose->replyto && !ignore_replyto)