From: Colin Leroy <colin@colino.net>
Date: Tue, 27 Nov 2007 07:25:12 +0000 (+0000)
Subject: 2007-11-27 [colin]	3.1.0cvs31
X-Git-Tag: rel_3_2_0~49
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=344f99940f555af100054a2b02aecb483b03a953

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 3f525d270..18142a071 100644
--- 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
diff --git a/PATCHSETS b/PATCHSETS
index 52572cf17..c505eecfb 100644
--- 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.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 78756052e..b357c64a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=1
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=30
+EXTRA_VERSION=31
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/folder.c b/src/folder.c
index 2f268f511..55b83899b 100644
--- 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);
+		folder_item_commit_tags(dest->folder, dest, dest->tags, NULL);
 	}
 }
 
diff --git a/src/imap.c b/src/imap.c
index fd3c81a64..6299004b3 100644
--- 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) {
-				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) {
@@ -4781,7 +4781,7 @@ bail:
 					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) {