2010-09-17 [pawel] 3.7.6cvs37
authorPaweł Pękala <c0rn@gazeta.pl>
Fri, 17 Sep 2010 19:25:30 +0000 (19:25 +0000)
committerPaweł Pękala <c0rn@gazeta.pl>
Fri, 17 Sep 2010 19:25:30 +0000 (19:25 +0000)
* src/compose.c
Respect reply_account_autosel when changing compose
account to email one while replying to NNTP post

ChangeLog
PATCHSETS
configure.ac
src/compose.c

index 8498c49..2040685 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-17 [pawel]     3.7.6cvs37
+
+       * src/compose.c
+               Respect reply_account_autosel when changing compose
+               account to email one while replying to NNTP post
+
 2010-09-17 [wwp]       3.7.6cvs36
 
        * doc/man/claws-mail.1
index c072192..22dfe27 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.382.2.553 -r 1.382.2.554 src/compose.c;  ) > 3.7.6cvs34.patchset
 ( cvs diff -u -r 1.382.2.554 -r 1.382.2.555 src/compose.c;  ) > 3.7.6cvs35.patchset
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 doc/man/claws-mail.1;  ) > 3.7.6cvs36.patchset
+( cvs diff -u -r 1.382.2.555 -r 1.382.2.556 src/compose.c;  ) > 3.7.6cvs37.patchset
index 3042113..1257903 100644 (file)
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=36
+EXTRA_VERSION=37
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index f86d7ff..db19a22 100644 (file)
@@ -3194,6 +3194,9 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
                        }
                }
        } else {
+               if ((to_sender || to_ml) && prefs_common.reply_account_autosel)
+                       compose_check_for_email_account(compose);
+
                if (to_sender || (compose->followup_to && 
                        !strncmp(compose->followup_to, "poster", 6)))
                        compose_entry_append
@@ -3215,7 +3218,6 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
                                 compose->newsgroups ? compose->newsgroups : "",
                                 COMPOSE_NEWSGROUPS, PREF_NONE);
                } else if (reply_to_ml) {
-                       compose_check_for_email_account(compose);
                        compose_entry_append(compose,
                                   compose->ml_post, COMPOSE_TO, PREF_ML); 
                } else 
@@ -11180,7 +11182,10 @@ void compose_reply_to_address(MessageView *msgview, MsgInfo *msginfo,
        msginfo_list = g_slist_prepend(msginfo_list, msginfo);
        
        compose = compose_reply_mode(COMPOSE_REPLY_TO_ADDRESS, msginfo_list, body);
-       compose_check_for_email_account(compose);
+
+       if (prefs_common.reply_account_autosel)
+               compose_check_for_email_account(compose);
+
        compose_set_folder_prefs(compose, msginfo->folder, FALSE);
        compose_entry_append(compose, address, COMPOSE_TO, PREF_NONE);
        compose_reply_set_subject(compose, msginfo);