2006-06-30 [paul] 2.3.1cvs46

	* src/send_message.c
		when editing From in the Compose window, use that address
		in the Return-Path: header
		Thanks to Colin

diff --git a/ChangeLog b/ChangeLog
index 43e92b13f481de0ce484b901c976d6c4b1c50a12..ba42019199082ac10863d9514b735e27d4c7d56e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-30 [paul]      2.3.1cvs46
+
+       * src/send_message.c
+               when editing From in the Compose window, use that address
+               in the Return-Path: header
+               Thanks to Colin
+
 2006-06-30 [colin]     2.3.1cvs45
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 87023473b9d949769d54ec29bfa52d5f0da45f60..194bd60563b4c494b19df7821ab96fcdb334e70c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1646,3 +1646,4 @@
 ( cvs diff -u -r 1.9.2.40 -r 1.9.2.41 src/gtk/gtkaspell.c;  ) > 2.3.1cvs43.patchset
 ( cvs diff -u -r 1.207.2.104 -r 1.207.2.105 src/folderview.c;  cvs diff -u -r 1.20.2.11 -r 1.20.2.12 src/folderview.h;  cvs diff -u -r 1.274.2.121 -r 1.274.2.122 src/mainwindow.c;  cvs diff -u -r 1.395.2.221 -r 1.395.2.222 src/summaryview.c;  cvs diff -u -r 1.36.2.69 -r 1.36.2.70 src/common/utils.c;  ) > 2.3.1cvs44.patchset
 ( cvs diff -u -r 1.382.2.289 -r 1.382.2.290 src/compose.c;  ) > 2.3.1cvs45.patchset
+( cvs diff -u -r 1.17.2.31 -r 1.17.2.32 src/send_message.c;  ) > 2.3.1cvs46.patchset

diff --git a/configure.ac b/configure.ac
index 09bf715241b62c58bc5799869f3b6c38c55d1fab..848f3bb8cd9a1549ec446d24fa6bf74197257e72 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=45
+EXTRA_VERSION=46
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/send_message.c b/src/send_message.c
index 29cfc80eef9f4eee341031b830d87b64fca8bbec..d9a39dac0efffb278301be8f01b88403d8707183 100644 (file)
--- a/src/send_message.c
+++ b/src/send_message.c
@@ -202,6 +202,10 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
        gchar buf[BUFFSIZE];
        gint ret = 0;
        gboolean was_inited = FALSE;
+       MsgInfo *tmp_msginfo = NULL;
+       MsgFlags flags = {0, 0};
+       long fp_pos = 0;
+       gchar spec_from[BUFFSIZE];
 
        g_return_val_if_fail(ac_prefs != NULL, -1);
        g_return_val_if_fail(ac_prefs->address != NULL, -1);
@@ -209,6 +213,23 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
        g_return_val_if_fail(to_list != NULL, -1);
        g_return_val_if_fail(fp != NULL, -1);
 
+       /* get the From address used, not necessarily the ac_prefs',
+        * because it's editable. */
+
+       fp_pos = ftell(fp);
+       tmp_msginfo = procheader_parse_stream(fp, flags, FALSE, FALSE);
+       fseek(fp, fp_pos, SEEK_SET);
+       
+       if (tmp_msginfo && tmp_msginfo->from) {
+               strncpy2(spec_from, tmp_msginfo->from, BUFFSIZE-1);
+               extract_address(spec_from);
+       } else {
+               strncpy2(spec_from, ac_prefs->address, BUFFSIZE-1);
+       }
+       if (tmp_msginfo) {
+               procmsg_msginfo_free(tmp_msginfo);
+       }
+
        if (!ac_prefs->session) {
                /* we can't reuse a previously initialised session */
                session = smtp_session_new();
@@ -334,11 +355,11 @@ gint send_message_smtp_full(PrefsAccount *ac_prefs, GSList *to_list, FILE *fp, g
        }
 
        /* This has to be initialised for every mail sent */
-       smtp_session->from = g_strdup(ac_prefs->address);
+       smtp_session->from = g_strdup(spec_from);
        smtp_session->to_list = to_list;
        smtp_session->cur_to = to_list;
-       smtp_session->send_data = get_outgoing_rfc2822_str(fp);
-       smtp_session->send_data_len = strlen(smtp_session->send_data);
+       smtp_session->send_data = (guchar *)get_outgoing_rfc2822_str(fp);
+       smtp_session->send_data_len = strlen((gchar *)smtp_session->send_data);
 
        session_set_timeout(session,
                            prefs_common.io_timeout_secs * 1000);