From 8cd62879327d3068f6ef8e243cf275278c2265a6 Mon Sep 17 00:00:00 2001 From: Not Zed Date: Wed, 13 Aug 2003 16:40:12 +0000 Subject: Fix the range check, we were stopping removal of 1 or 2 removals, for some 2003-08-13 Not Zed * camel-folder-summary.c (camel_folder_summary_remove_range): Fix the range check, we were stopping removal of 1 or 2 removals, for some odd and completely uncomprehensible reason. Perhaps debug left in? 2003-08-13 Not Zed ** See bug #47517. * camel-vee-folder.c (vee_sync): Always rebuild folder on any sync, not just expunge ones. svn path=/trunk/; revision=22216 --- camel/ChangeLog | 14 ++++++++++++++ camel/camel-folder-summary.c | 2 +- camel/camel-vee-folder.c | 4 ++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/camel/ChangeLog b/camel/ChangeLog index ef38f2820d..39bb9482fa 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,17 @@ +2003-08-13 Not Zed + + * camel-folder-summary.c (camel_folder_summary_remove_range): Fix + the range check, we were stopping removal of 1 or 2 removals, for + some odd and completely uncomprehensible reason. Perhaps debug + left in? + +2003-08-13 Not Zed + + ** See bug #47517. + + * camel-vee-folder.c (vee_sync): Always rebuild folder on any + sync, not just expunge ones. + 2003-08-11 Not Zed * providers/imapp/camel-imapp-store.c (imap_get_folder_info): diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c index 6306280f63..5efc369cb5 100644 --- a/camel/camel-folder-summary.c +++ b/camel/camel-folder-summary.c @@ -1188,7 +1188,7 @@ void camel_folder_summary_remove_index(CamelFolderSummary *s, int index) **/ void camel_folder_summary_remove_range(CamelFolderSummary *s, int start, int end) { - if (end <= start+1) + if (end < start) return; CAMEL_SUMMARY_LOCK(s, summary_lock); diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c index c17f7a0bde..cd1ea40045 100644 --- a/camel/camel-vee-folder.c +++ b/camel/camel-vee-folder.c @@ -612,13 +612,13 @@ vee_sync(CamelFolder *folder, gboolean expunge, CamelException *ex) break; } - if (expunge && vee_folder_build_folder(vf, f, ex) == -1) + if (vee_folder_build_folder(vf, f, ex) == -1) break; node = node->next; } - if (expunge && node == NULL) { + if (node == NULL) { CAMEL_VEE_FOLDER_LOCK(vf, changed_lock); g_list_free(p->folders_changed); p->folders_changed = NULL; -- cgit v1.2.3