From ba3b782b91e4c8b1920da972a078d38de2ac4467 Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Fri, 17 Mar 2006 09:59:40 +0000 Subject: [PATCH] 2006-03-17 [wwp] 2.0.0cvs146 * src/procmsg.c * src/compose.c fix for bug #908: some IMAP servers dislike \x7f char in the RMID (thanks to Colin). --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/compose.c | 4 ++-- src/procmsg.c | 4 ++-- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e68c04389..a74acfefe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-03-17 [wwp] 2.0.0cvs146 + + * src/procmsg.c + * src/compose.c + fix for bug #908: some IMAP servers dislike \x7f char in the RMID (thanks to Colin). + 2006-03-17 [paul] 2.1.0-rc1 released diff --git a/PATCHSETS b/PATCHSETS index d35eb6015..6e368deca 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1331,3 +1331,4 @@ ( cvs diff -u -r 1.382.2.250 -r 1.382.2.251 src/compose.c; cvs diff -u -r 1.50.2.22 -r 1.50.2.23 src/compose.h; ) > 2.0.0cvs143.patchset ( cvs diff -u -r 1.9.2.16 -r 1.9.2.17 src/sourcewindow.c; cvs diff -u -r 1.1.1.1.16.2 -r 1.1.1.1.16.3 src/sourcewindow.h; ) > 2.0.0cvs144.patchset ( cvs diff -u -r 1.115.2.77 -r 1.115.2.78 src/main.c; cvs diff -u -r 1.96.2.101 -r 1.96.2.102 src/textview.c; ) > 2.0.0cvs145.patchset +( cvs diff -u -r 1.150.2.58 -r 1.150.2.59 src/procmsg.c; cvs diff -u -r 1.382.2.251 -r 1.382.2.252 src/compose.c; ) > 2.0.0cvs146.patchset diff --git a/configure.ac b/configure.ac index efd3d8f9f..7b5dc5811 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=145 +EXTRA_VERSION=146 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/compose.c b/src/compose.c index d6b456b53..f3a044bea 100644 --- a/src/compose.c +++ b/src/compose.c @@ -4567,7 +4567,7 @@ static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item, gchar *folderid; folderid = folder_item_get_identifier(compose->replyinfo->folder); - fprintf(fp, "RMID:%s\x7f%d\x7f%s\n", folderid, compose->replyinfo->msgnum, compose->replyinfo->msgid); + fprintf(fp, "RMID:%s\t%d\t%s\n", folderid, compose->replyinfo->msgnum, compose->replyinfo->msgid); g_free(folderid); } /* Message-ID of message forwarding to */ @@ -4575,7 +4575,7 @@ static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item, gchar *folderid; folderid = folder_item_get_identifier(compose->fwdinfo->folder); - fprintf(fp, "FMID:%s\x7f%d\x7f%s\n", folderid, compose->fwdinfo->msgnum, compose->fwdinfo->msgid); + fprintf(fp, "FMID:%s\t%d\t%s\n", folderid, compose->fwdinfo->msgnum, compose->fwdinfo->msgid); g_free(folderid); } fprintf(fp, "\n"); diff --git a/src/procmsg.c b/src/procmsg.c index cd247811a..72ef6c81f 100644 --- a/src/procmsg.c +++ b/src/procmsg.c @@ -1589,9 +1589,9 @@ static gint procmsg_send_message_queue_full(const gchar *file, gboolean keep_ses FolderItem *item; if (replymessageid != NULL) - tokens = g_strsplit(replymessageid, "\x7f", 0); + tokens = g_strsplit(replymessageid, "\t", 0); else - tokens = g_strsplit(fwdmessageid, "\x7f", 0); + tokens = g_strsplit(fwdmessageid, "\t", 0); item = folder_find_item_from_identifier(tokens[0]); /* check if queued message has valid folder and message id */ -- 2.25.1