From 6001e82295b6e218b1cb9b8cf1a950cf61b01919 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 11 Sep 2008 15:11:04 +0000 Subject: ** Fix for bug #534039 2008-09-11 Milan Crha ** Fix for bug #534039 * mail-vfolder.c: (vfolder_load_storage): Load store to mail component first, to have all notifications registered in time of adding rules. * mail-folder-cache.c: (real_flush_updates): Dropped unnecessary and offending code causing infinite loops when deleting search folder. svn path=/trunk/; revision=36304 --- mail/mail-folder-cache.c | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'mail/mail-folder-cache.c') diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c index 63a8f2cf90..b610a8a2b5 100644 --- a/mail/mail-folder-cache.c +++ b/mail/mail-folder-cache.c @@ -206,19 +206,6 @@ real_flush_updates(void *o, void *event_data, void *data) e_event_emit((EEvent *)e, "folder.changed", (EEventTarget *)t); } - if (CAMEL_IS_VEE_STORE (up->store) && !up->remove) { - /* Normally the vfolder store takes care of the folder_opened event itself, - but we add folder to the noting system later, thus we do not know about - search folders to update them in a tree, thus ensure their changes will - be tracked correctly. */ - CamelFolder *folder = camel_store_get_folder (up->store, up->full_name, 0, NULL); - - if (folder) { - mail_note_folder (folder); - camel_object_unref (folder); - } - } - free_update(up); LOCK(info_lock); -- cgit v1.2.3