2006-11-26 [paul] 2.6.0cvs60

	* src/compose.c
		fix bug that caused the wrong recipient
		to be selected when replying to a msg
		which is From one of our accounts to
		another of our accounts

diff --git a/ChangeLog b/ChangeLog
index 96e15280398152f996d893c49beaf5025cde90d9..4fbe4842d4517b5392d6b16e2a14677eebb4fdb8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-11-26 [paul]      2.6.0cvs60
+
+       * src/compose.c
+               fix bug that caused the wrong recipient
+               to be selected when replying to a msg
+               which is From one of our accounts to
+               another of our accounts
+
 2006-11-25 [paul]      2.6.0cvs59
 
        * src/summaryview.c

diff --git a/PATCHSETS b/PATCHSETS
index d5791a23aa5915daedac665a4bedb4d76f0a8af8..34f1da0b70d91faf512990a94ac026b1800d680b 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2084,3 +2084,4 @@
 ( cvs diff -u -r 1.382.2.332 -r 1.382.2.333 src/compose.c;  ) > 2.6.0cvs57.patchset
 ( cvs diff -u -r 1.382.2.333 -r 1.382.2.334 src/compose.c;  ) > 2.6.0cvs58.patchset
 ( cvs diff -u -r 1.395.2.267 -r 1.395.2.268 src/summaryview.c;  ) > 2.6.0cvs59.patchset
+( cvs diff -u -r 1.382.2.334 -r 1.382.2.335 src/compose.c;  ) > 2.6.0cvs60.patchset

diff --git a/configure.ac b/configure.ac
index 5d09c5bb7e2694b61838610c070344e7c4ba4d26..5d0197a3bff30d0e8878efdf29a596c6dfd57568 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=59
+EXTRA_VERSION=60
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index d15a4d2285b25b09c04ca382100d83f8d4bc43ce..4a67e0553f3d3c2410840c7cb2d832cf4c1f3e5c 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1358,7 +1358,7 @@ static Compose *compose_generic_reply(MsgInfo *msginfo, gboolean quote,
        g_return_val_if_fail(msginfo->folder != NULL, NULL);
 
        account = account_get_reply_account(msginfo, prefs_common.reply_account_autosel);
-       
+
        g_return_val_if_fail(account != NULL, NULL);
 
        if (to_sender && account->protocol == A_NNTP &&
@@ -2714,7 +2714,7 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
                        else if (!to_all && !to_sender) {
                                /* reply to the last list of recipients */
                                compose_entry_append(compose,
-                                         msginfo->to ? msginfo->to : "",
+                                         msginfo->from ? msginfo->from : "",
                                          COMPOSE_TO);
                                compose_entry_append(compose,
                                          msginfo->cc ? msginfo->cc : "",
@@ -4110,6 +4110,7 @@ gboolean compose_check_for_valid_recipient(Compose *compose) {
                gchar *entry;
                header = gtk_editable_get_chars(GTK_EDITABLE(GTK_COMBO(((ComposeHeaderEntry *)list->data)->combo)->entry), 0, -1);
                entry = gtk_editable_get_chars(GTK_EDITABLE(((ComposeHeaderEntry *)list->data)->entry), 0, -1);
+
                g_strstrip(entry);
                if (entry[0] != '\0') {
                        for (strptr = recipient_headers_mail; *strptr != NULL; strptr++) {
@@ -9288,7 +9289,7 @@ static void compose_reply_from_messageview_real(MessageView *msgview, GSList *ms
        if (g_slist_length(msginfo_list) == 1 && !opening_multiple) {
                MimeInfo *mimeinfo = messageview_get_selected_mime_part(msgview);
                MsgInfo *orig_msginfo = (MsgInfo *)msginfo_list->data;
-               
+
                if (mimeinfo != NULL && mimeinfo->type == MIMETYPE_MESSAGE && 
                    !g_ascii_strcasecmp(mimeinfo->subtype, "rfc822")) {
                        tmp_msginfo = procmsg_msginfo_new_from_mimeinfo(