2005-03-20 [paul] 1.9.6cvs2

	* src/compose.c
		sync with HEAD (1.0.3cvs5)
		neglect Reply-To header if empty
		Patch by Alfons

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 2836ad92e9b1bc36f08dc11cfdf6c9e8fa430d5d..0f5baf6bc9e58a616a2cf1c38322cca9b6394da9 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,10 @@
+2005-03-20 [paul]      1.9.6cvs2
+
+       * src/compose.c
+               sync with HEAD (1.0.3cvs5)
+               neglect Reply-To header if empty
+               Patch by Alfons 
+

 2005-03-19 [holger]    1.9.6cvs1
 
        * src/summaryview.c
 2005-03-19 [holger]    1.9.6cvs1
 
        * src/summaryview.c

diff --git a/PATCHSETS b/PATCHSETS
index 733306c0fdfe2308e86b1b33a0d3ae92da61e559..ab7c4809917460a5e5086cb23e318e5d82b97306 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -418,3 +418,4 @@
 ( cvs diff -u -r 1.395.2.59 -r 1.395.2.60 src/summaryview.c; ) > 1.0.3cvs2.6.patchset
 ( cvs diff -u -r 1.100.2.13 -r 1.100.2.14 AUTHORS; cvs diff -u -r 1.2504.2.53 -r 1.2504.2.54 ChangeLog.claws; cvs diff -u -r 1.654.2.451 -r 1.654.2.452 configure.ac; cvs diff -u -r 1.4.2.7 -r 1.4.2.8 src/gtk/about.c; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/sylpheed_logo.xpm; ) > 1.0.3cvs3.1.patchset
 ( cvs diff -u -r 1.395.2.60 -r 1.395.2.61 src/summaryview.c; cvs diff -u -r 1.68.2.5 -r 1.68.2.6 src/summaryview.h; ) > 1.9.6cvs1.patchset
 ( cvs diff -u -r 1.395.2.59 -r 1.395.2.60 src/summaryview.c; ) > 1.0.3cvs2.6.patchset
 ( cvs diff -u -r 1.100.2.13 -r 1.100.2.14 AUTHORS; cvs diff -u -r 1.2504.2.53 -r 1.2504.2.54 ChangeLog.claws; cvs diff -u -r 1.654.2.451 -r 1.654.2.452 configure.ac; cvs diff -u -r 1.4.2.7 -r 1.4.2.8 src/gtk/about.c; cvs diff -u -r 1.1 -r 1.2 src/pixmaps/sylpheed_logo.xpm; ) > 1.0.3cvs3.1.patchset
 ( cvs diff -u -r 1.395.2.60 -r 1.395.2.61 src/summaryview.c; cvs diff -u -r 1.68.2.5 -r 1.68.2.6 src/summaryview.h; ) > 1.9.6cvs1.patchset

+( cvs diff -u -r 1.382.2.111 -r 1.382.2.112 src/compose.c; ) > 1.9.6cvs2.patchset

diff --git a/configure.ac b/configure.ac
index dbba4eb022719984cd0737e6491ac0e9d214069d..ff9d55658960d71ea55f3aee3b279badad643c6e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=1
+EXTRA_VERSION=2

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index e8ca3315e5a0d2af94317c18c5409d7457c581d6..7086217d9811ef158203685f45949695e341376b 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1673,6 +1673,12 @@ static gint compose_parse_header(Compose *compose, MsgInfo *msginfo)
                        conv_unmime_header(hentry[H_REPLY_TO].body, NULL);
                g_free(hentry[H_REPLY_TO].body);
                hentry[H_REPLY_TO].body = NULL;
                        conv_unmime_header(hentry[H_REPLY_TO].body, NULL);
                g_free(hentry[H_REPLY_TO].body);
                hentry[H_REPLY_TO].body = NULL;

+               /* if empty replyto, let sylpheed figure it out, i.e.
+                 * neglect the reply-to header. */
+                if (*(compose->replyto) == 0) {
+                        g_free(compose->replyto);
+                        compose->replyto = NULL;
+                }

        }
        if (hentry[H_CC].body != NULL) {
                compose->cc = conv_unmime_header(hentry[H_CC].body, NULL);
        }
        if (hentry[H_CC].body != NULL) {
                compose->cc = conv_unmime_header(hentry[H_CC].body, NULL);