2010-09-19 [colin] 3.7.6cvs38

	* src/compose.c
		Revert previous commit (which breaks Reply to newsgroups)

diff --git a/ChangeLog b/ChangeLog
index 204068561b4203e9eebb227e2e2c2a04f493100a..33b1e6679a074f394565db8c6d384c16d8f41e59 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-19 [colin]     3.7.6cvs38
+
+       * src/compose.c
+               Revert previous commit (which breaks Reply to newsgroups)
+
 2010-09-17 [pawel]     3.7.6cvs37
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 22dfe27ea31de7012667e66944690d270576f9f0..1af09f7934af3392695f49436bbd95ace090ea00 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4033,3 +4033,4 @@
 ( 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
+( cvs diff -u -r 1.382.2.556 -r 1.382.2.557 src/compose.c;  ) > 3.7.6cvs38.patchset

diff --git a/configure.ac b/configure.ac
index 12579035a8d43b8179ebe93479cc2204fbe0a32a..b6462ff411fcaa58b182e973705da3c0c74b3343 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=37
+EXTRA_VERSION=38
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index db19a222a67acd72bd595367eed455a8c97b681f..f86d7ff3dc31f930714d607dc73e9fec3d75a476 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -3194,9 +3194,6 @@ 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
@@ -3218,6 +3215,7 @@ 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 
@@ -11182,10 +11180,7 @@ 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);
-
-       if (prefs_common.reply_account_autosel)
-               compose_check_for_email_account(compose);
-
+       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);