2007-11-27 [colin] 3.1.0cvs31

	* src/folder.c
	* src/imap.c
		Fix tags loss on move, fix space encoding

diff --git a/ChangeLog b/ChangeLog
index 3f525d27011f97b8a138d1ca85e23a589c007710..18142a0715332f21176229c71944425470fe8a0c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-11-27 [colin]     3.1.0cvs31
+
+       * src/folder.c
+       * src/imap.c
+               Fix tags loss on move, fix space encoding
+

 2007-11-26 [colin]     3.1.0cvs30
 
        * src/edittags.c
 2007-11-26 [colin]     3.1.0cvs30
 
        * src/edittags.c

diff --git a/PATCHSETS b/PATCHSETS
index 52572cf17451c63562799a802843768017b03955..c505eecfba214aeec3e0a123f58acfdedced43d9 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3088,3 +3088,4 @@
 ( cvs diff -u -r 1.94.2.164 -r 1.94.2.165 src/messageview.c;  cvs diff -u -r 1.49.2.103 -r 1.49.2.104 src/procmime.c;  ) > 3.1.0cvs28.patchset
 ( cvs diff -u -r 1.179.2.198 -r 1.179.2.199 src/imap.c;  ) > 3.1.0cvs29.patchset
 ( cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/edittags.c;  cvs diff -u -r 1.213.2.167 -r 1.213.2.168 src/folder.c;  cvs diff -u -r 1.87.2.50 -r 1.87.2.51 src/folder.h;  cvs diff -u -r 1.179.2.199 -r 1.179.2.200 src/imap.c;  cvs diff -u -r 1.94.2.165 -r 1.94.2.166 src/messageview.c;  cvs diff -u -r 1.150.2.105 -r 1.150.2.106 src/procmsg.c;  cvs diff -u -r 1.60.2.50 -r 1.60.2.51 src/procmsg.h;  cvs diff -u -r 1.395.2.339 -r 1.395.2.340 src/summaryview.c;  cvs diff -u -r 1.36.2.126 -r 1.36.2.127 src/common/utils.c;  cvs diff -u -r 1.20.2.55 -r 1.20.2.56 src/common/utils.h;  cvs diff -u -r 1.1.4.88 -r 1.1.4.89 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.20 -r 1.1.4.21 src/etpan/imap-thread.h;  ) > 3.1.0cvs30.patchset
 ( cvs diff -u -r 1.94.2.164 -r 1.94.2.165 src/messageview.c;  cvs diff -u -r 1.49.2.103 -r 1.49.2.104 src/procmime.c;  ) > 3.1.0cvs28.patchset
 ( cvs diff -u -r 1.179.2.198 -r 1.179.2.199 src/imap.c;  ) > 3.1.0cvs29.patchset
 ( cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/edittags.c;  cvs diff -u -r 1.213.2.167 -r 1.213.2.168 src/folder.c;  cvs diff -u -r 1.87.2.50 -r 1.87.2.51 src/folder.h;  cvs diff -u -r 1.179.2.199 -r 1.179.2.200 src/imap.c;  cvs diff -u -r 1.94.2.165 -r 1.94.2.166 src/messageview.c;  cvs diff -u -r 1.150.2.105 -r 1.150.2.106 src/procmsg.c;  cvs diff -u -r 1.60.2.50 -r 1.60.2.51 src/procmsg.h;  cvs diff -u -r 1.395.2.339 -r 1.395.2.340 src/summaryview.c;  cvs diff -u -r 1.36.2.126 -r 1.36.2.127 src/common/utils.c;  cvs diff -u -r 1.20.2.55 -r 1.20.2.56 src/common/utils.h;  cvs diff -u -r 1.1.4.88 -r 1.1.4.89 src/etpan/imap-thread.c;  cvs diff -u -r 1.1.4.20 -r 1.1.4.21 src/etpan/imap-thread.h;  ) > 3.1.0cvs30.patchset

+( cvs diff -u -r 1.213.2.168 -r 1.213.2.169 src/folder.c;  cvs diff -u -r 1.179.2.200 -r 1.179.2.201 src/imap.c;  ) > 3.1.0cvs31.patchset

diff --git a/configure.ac b/configure.ac
index 78756052e53663bff7c9a15f5a2adbeea6f2618e..b357c64a0e0172f6b2ae5e412475592e60677c7a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=30
+EXTRA_VERSION=31

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/folder.c b/src/folder.c
index 2f268f51165c78e20812b8d3b5b1df41d6cc65ce..55b83899b2a678f06c00266f53f422d4043649f7 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -2765,6 +2765,7 @@ static void copy_msginfo_flags(MsgInfo *source, MsgInfo *dest)
        if (source && source->tags) {
                g_slist_free(dest->tags);
                dest->tags = g_slist_copy(source->tags);
        if (source && source->tags) {
                g_slist_free(dest->tags);
                dest->tags = g_slist_copy(source->tags);

+               folder_item_commit_tags(dest->folder, dest, dest->tags, NULL);

        }
 }
 
        }
 }
 

diff --git a/src/imap.c b/src/imap.c
index fd3c81a641dbaf32d911c1d5d068140375ffae50..6299004b3cd539aacf1bd284d9974b07414513c0 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -2871,7 +2871,7 @@ static void *imap_get_uncached_messages_thread(void *data)
                                msginfo->tags = NULL;
                        }
                        for (cur = tags; cur; cur = cur->next) {
                                msginfo->tags = NULL;
                        }
                        for (cur = tags; cur; cur = cur->next) {

-                               gchar *real_tag = imap_modified_utf7_to_utf8(cur->data, FALSE);
+                               gchar *real_tag = imap_modified_utf7_to_utf8(cur->data, TRUE);

                                gint id = 0;
                                id = tags_get_id_for_str(real_tag);
                                if (id == -1) {
                                gint id = 0;
                                id = tags_get_id_for_str(real_tag);
                                if (id == -1) {


@@ -4781,7 +4781,7 @@ bail:
                                        msginfo->tags = NULL;
                                }
                                for (cur = tags; cur; cur = cur->next) {
                                        msginfo->tags = NULL;
                                }
                                for (cur = tags; cur; cur = cur->next) {

-                                       gchar *real_tag = imap_modified_utf7_to_utf8(cur->data, FALSE);
+                                       gchar *real_tag = imap_modified_utf7_to_utf8(cur->data, TRUE);

                                        gint id = 0;
                                        id = tags_get_id_for_str(real_tag);
                                        if (id == -1) {
                                        gint id = 0;
                                        id = tags_get_id_for_str(real_tag);
                                        if (id == -1) {