2005-11-24 [cleroy] 1.9.100cvs32

	* src/compose.c
		Fix bug #856 (reediting messages forgets Request
		Return Receipt)

diff --git a/ChangeLog b/ChangeLog
index 4b4ab37fa03abf4a00e4ea5028705305cf09a440..ab3c42a6180f27d1661da821375c07081e1d9652 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-24 [cleroy]    1.9.100cvs32
+
+       * src/compose.c
+               Fix bug #856 (reediting messages forgets Request
+               Return Receipt)
+
 2005-11-24 [paul]      1.9.100cvs31
 
        * manual/addrbook.xml

diff --git a/PATCHSETS b/PATCHSETS
index 8cba6639c7b72bc88040213d71df2ad2ce68deb6..dfe0fa2da4830d66617d42b220c8b4f57c80a90d 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1015,3 +1015,4 @@
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 manual/advanced.xml;  ) > 1.9.100cvs29.patchset
 ( cvs diff -u -r 1.60.2.39 -r 1.60.2.40 src/addressbook.c;  cvs diff -u -r 1.28.2.12 -r 1.28.2.13 src/addrindex.c;  cvs diff -u -r 1.2.4.9 -r 1.2.4.10 src/browseldap.c;  cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/wizard.c;  ) > 1.9.100cvs30.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/addrbook.xml;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/advanced.xml;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/starting.xml;  cvs diff -u -r 1.14.2.7 -r 1.14.2.8 src/importldif.c;  cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/wizard.c;  ) > 1.9.100cvs31.patchset
+( cvs diff -u -r 1.382.2.196 -r 1.382.2.197 src/compose.c;  ) > 1.9.100cvs32.patchset

diff --git a/configure.ac b/configure.ac
index 936c1efb10ac7ca68b929ea604e8d9784c0c94a2..d83e39259ec36b954ef84d1efdd9e3f84db79fd4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=100
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=31
+EXTRA_VERSION=32
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 88c6f1dba9fcedde54054138700bb99c3ce50572..15f5de55c9992be0fbf15902ba4f000ae44e99b1 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1562,6 +1562,14 @@ void compose_reedit(MsgInfo *msginfo)
                        gtk_editable_delete_text(GTK_EDITABLE(compose->savemsg_entry), 0, -1);
                        gtk_editable_insert_text(GTK_EDITABLE(compose->savemsg_entry), &queueheader_buf[4], strlen(&queueheader_buf[4]), &startpos);
                }
+               if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf, sizeof(queueheader_buf), "RRCPT:")) {
+                       gint active = atoi(&queueheader_buf[strlen("RRCPT:")]);
+                       if (active) {
+                               GtkItemFactory *ifactory;
+                               ifactory = gtk_item_factory_from_widget(compose->menubar);
+                               menu_set_active(ifactory, "/Options/Request Return Receipt", TRUE);
+                       }
+               }
        }
        
        if (compose_parse_header(compose, msginfo) < 0) return;
@@ -4380,6 +4388,10 @@ static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item,
                fprintf(fp, "SCF:%s\n", savefolderid);
                g_free(savefolderid);
        }
+       /* Save copy folder */
+       if (compose->return_receipt) {
+               fprintf(fp, "RRCPT:1\n");
+       }
        /* Message-ID of message replying to */
        if ((compose->replyinfo != NULL) && (compose->replyinfo->msgid != NULL)) {
                gchar *folderid;
@@ -6963,6 +6975,9 @@ static void compose_draft_cb(gpointer data, guint action, GtkWidget *widget)
                fprintf(fp, "SCF:%s\n", savefolderid);
                g_free(savefolderid);
        }
+       if (compose->return_receipt) {
+               fprintf(fp, "RRCPT:1\n");
+       }
        if (compose->privacy_system) {
                fprintf(fp, "X-Sylpheed-Sign:%d\n", compose->use_signing);
                fprintf(fp, "X-Sylpheed-Encrypt:%d\n", compose->use_encryption);