From: Colin Leroy Date: Fri, 17 Dec 2010 08:00:10 +0000 (+0000) Subject: 2010-12-17 [colin] 3.7.8cvs7 X-Git-Tag: REL_3_7_9~72 X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=26c5c0fcd5cbc68eb1bf4317632e5ae8ef0eeade 2010-12-17 [colin] 3.7.8cvs7 * src/folder.c Fix bug #2325, "messages remains in folder cache after moving from MH to IMAP boxes". Bug introduced in 3.7.6cvs53. --- diff --git a/ChangeLog b/ChangeLog index 8dac12d14..8199a2a55 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-12-17 [colin] 3.7.8cvs7 + + * src/folder.c + Fix bug #2325, "messages remains in folder cache after moving + from MH to IMAP boxes". Bug introduced in 3.7.6cvs53. + 2010-12-17 [colin] 3.7.8cvs6 * src/addressadd.c diff --git a/PATCHSETS b/PATCHSETS index 7a4bc189f..186007bf7 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4080,3 +4080,4 @@ ( cvs diff -u -r 1.5.2.40 -r 1.5.2.41 src/prefs_spelling.c; cvs diff -u -r 1.9.2.49 -r 1.9.2.50 src/common/defs.h; ) > 3.7.8cvs4.patchset ( cvs diff -u -r 1.28.2.44 -r 1.28.2.45 src/addrindex.c; cvs diff -u -r 1.8.2.37 -r 1.8.2.38 src/editldap.c; cvs diff -u -r 1.2.2.21 -r 1.2.2.22 src/ldapctrl.c; cvs diff -u -r 1.3.2.34 -r 1.3.2.35 src/ldapquery.c; cvs diff -u -r 1.4.2.18 -r 1.4.2.19 src/ldapserver.c; cvs diff -u -r 1.2.2.11 -r 1.2.2.12 src/ldapserver.h; cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/ldapupdate.c; cvs diff -u -r 1.1.4.16 -r 1.1.4.17 src/ldaputil.c; ) > 3.7.8cvs5.patchset ( cvs diff -u -r 1.9.2.30 -r 1.9.2.31 src/addressadd.c; cvs diff -u -r 1.60.2.138 -r 1.60.2.139 src/addressbook.c; cvs diff -u -r 1.28.2.45 -r 1.28.2.46 src/addrindex.c; cvs diff -u -r 1.3.2.35 -r 1.3.2.36 src/ldapquery.c; cvs diff -u -r 1.4.2.13 -r 1.4.2.14 src/ldapquery.h; cvs diff -u -r 1.4.2.19 -r 1.4.2.20 src/ldapserver.c; cvs diff -u -r 1.2.2.12 -r 1.2.2.13 src/ldapserver.h; cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/ldapupdate.c; cvs diff -u -r 1.1.4.17 -r 1.1.4.18 src/ldaputil.c; cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/ldaputil.h; ) > 3.7.8cvs6.patchset +( cvs diff -u -r 1.213.2.197 -r 1.213.2.198 src/folder.c; ) > 3.7.8cvs7.patchset diff --git a/configure.ac b/configure.ac index 12a35cb1c..036f0ef33 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=7 MICRO_VERSION=8 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=6 +EXTRA_VERSION=7 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/folder.c b/src/folder.c index affd58a38..7a7d346ba 100644 --- a/src/folder.c +++ b/src/folder.c @@ -3492,7 +3492,7 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour if (g_hash_table_lookup_extended(relation, msginfo, &old_key, &data)) num = GPOINTER_TO_INT(data); else - num = -1; + num = 0; if (g_slist_find(not_moved, msginfo)) continue; @@ -3539,7 +3539,7 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour if (g_hash_table_lookup_extended(relation, msginfo, &old_key, &data)) num = GPOINTER_TO_INT(data); else - num = -1; + num = 0; statusbar_progress_all(curmsg++,total, 100); if (curmsg % 100 == 0)