talons

commit 5ce200b94f4941a471b5ee8928c2fb17c0bbc5ea
parent 467216a618eb1e98180908ad1ed48f6862ecef30
Author: Colin Leroy <colin@colino.net>
Date:   Fri, 27 Mar 2009 18:35:47 +0000

2009-03-27 [colin]	3.7.1cvs27

	* src/imap.c
		Fix tag update when all tags are removed
		from another client

Diffstat:
M
ChangeLog
 | 
14
++++++++++++++
M
PATCHSETS
 | 
5
+++++
M
configure.ac
 | 
2
+-
M
src/imap.c
 | 
11
++++++-----

4 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,16 @@
+2009-03-27 [colin]	3.7.1cvs27
+
+	* src/imap.c
+		Fix tag update when all tags are removed 
+		from another client
+
+<<<<<<< ChangeLog
+2009-03-25 [colin]	3.7.1cvs26
+
+	* configure.ac
+		Fix configure.ac, thanks to Pawel
+
+=======
 2009-03-25 [colin]	3.7.1cvs25
 
 	* src/news.c
@@ -6,6 +19,7 @@
 		bug 1883, 'Message processing fails to 
 		act on Newsgroups: field'
 
+>>>>>>> 1.396.2.2926
 2009-03-23 [colin]	3.7.1cvs24
 
 	* src/textview.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3764,4 +3764,9 @@
 ( cvs diff -u -r 1.43.2.107 -r 1.43.2.108 src/toolbar.c;  cvs diff -u -r 1.36.2.168 -r 1.36.2.169 src/common/utils.c;  ) > 3.7.1cvs22.patchset
 ( cvs diff -u -r 1.654.2.3830 -r 1.654.2.3831 configure.ac;  ) > 3.7.1cvs23.patchset
 ( cvs diff -u -r 1.96.2.217 -r 1.96.2.218 src/textview.c;  ) > 3.7.1cvs24.patchset
+<<<<<<< PATCHSETS
+( cvs diff -u -r 1.654.2.3833 -r 1.654.2.3834 configure.ac;  ) > 3.7.1cvs26.patchset
+=======
 ( cvs diff -u -r 1.101.2.60 -r 1.101.2.61 src/news.c;  cvs diff -u -r 1.1.2.10 -r 1.1.2.11 src/etpan/nntp-thread.c;  ) > 3.7.1cvs25.patchset
+>>>>>>> 1.1.2.3777
+( cvs diff -u -r 1.179.2.244 -r 1.179.2.245 src/imap.c;  ) > 3.7.1cvs27.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=25
+EXTRA_VERSION=27
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/imap.c b/src/imap.c
@@ -3008,10 +3008,9 @@ static void *imap_get_uncached_messages_thread(void *data)
 				g_slist_free(tags);
 				continue;
 			}
-			if (tags != NULL) {
-				g_slist_free(msginfo->tags);
-				msginfo->tags = NULL;
-			}
+			g_slist_free(msginfo->tags);
+			msginfo->tags = NULL;
+
 			for (cur = tags; cur; cur = cur->next) {
 				gchar *real_tag = imap_modified_utf7_to_utf8(cur->data, TRUE);
 				gint id = 0;
@@ -3021,12 +3020,14 @@ static void *imap_get_uncached_messages_thread(void *data)
 					got_alien_tags = TRUE;
 				}
 				if (!g_slist_find(msginfo->tags, GINT_TO_POINTER(id))) {
-					msginfo->tags = g_slist_append(
+					msginfo->tags = g_slist_prepend(
 							msginfo->tags,
 							GINT_TO_POINTER(id));
 				}
 				g_free(real_tag);
 			}
+			if (msginfo->tags)
+				msginfo->tags = g_slist_reverse(msginfo->tags);
 			slist_free_strings(tags);
 			g_slist_free(tags);
 			msginfo->folder = item;