2006-06-13 [colin] 2.3.0cvs9

	* src/messageview.c
		Fix sending of return receipt with the new queue folders

diff --git a/ChangeLog b/ChangeLog
index 6f51378f687c9c3a438cdeef693882085f98cdd0..21c27808a888ef371cc2020920ad30c04d39af2b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-13 [colin]     2.3.0cvs9
+
+       * src/messageview.c
+               Fix sending of return receipt with the new queue folders
+

 2006-06-13 [wwp]       2.3.0cvs8
 
        * src/quote_fmt_lex.l
 2006-06-13 [wwp]       2.3.0cvs8
 
        * src/quote_fmt_lex.l

diff --git a/PATCHSETS b/PATCHSETS
index 1813cc06d7bd3c3f2e0795741090eb94dfbdea7b..e3251d97f138ae178caa0df0d0e0ee9bc3304c25 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1583,3 +1583,4 @@
 ( cvs diff -u -r 1.207.2.102 -r 1.207.2.103 src/folderview.c;  ) > 2.3.0cvs6.patchset
 ( cvs diff -u -r 1.213.2.98 -r 1.213.2.99 src/folder.c;  cvs diff -u -r 1.52.2.21 -r 1.52.2.22 src/prefs_folder_item.c;  ) > 2.3.0cvs7.patchset
 ( cvs diff -u -r 1.8.2.3 -r 1.8.2.4 src/quote_fmt_lex.l;  ) > 2.3.0cvs8.patchset
 ( cvs diff -u -r 1.207.2.102 -r 1.207.2.103 src/folderview.c;  ) > 2.3.0cvs6.patchset
 ( cvs diff -u -r 1.213.2.98 -r 1.213.2.99 src/folder.c;  cvs diff -u -r 1.52.2.21 -r 1.52.2.22 src/prefs_folder_item.c;  ) > 2.3.0cvs7.patchset
 ( cvs diff -u -r 1.8.2.3 -r 1.8.2.4 src/quote_fmt_lex.l;  ) > 2.3.0cvs8.patchset

+( cvs diff -u -r 1.94.2.86 -r 1.94.2.87 src/messageview.c;  ) > 2.3.0cvs9.patchset

diff --git a/configure.ac b/configure.ac
index 8ca6313afed03815a12611081f6ef099cdfd099d..4c03d8c94a71d005b11e2739ea7418dfb691fbd3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=8
+EXTRA_VERSION=9

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/messageview.c b/src/messageview.c
index 96fbb30c72901ef4019d02ee11ef61d81f012f32..6e48381cf7f164744d17318eea8528a286e156d7 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -654,7 +654,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
                g_free(path);
        }               
 
                g_free(path);
        }               
 

-       fprintf(fp, "\n");
+       fprintf(fp, "X-Sylpheed-End-Special-Headers: 1\n");

        
        /* Date */
        get_rfc822_date(buf, sizeof(buf));
        
        /* Date */
        get_rfc822_date(buf, sizeof(buf));