** BUGFIX: #583507 - Fix for evolution hang while updating search folder

	* camel/camel-vee-folder.c: Hold the locks appropriately.

diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c
index 1b614a9..78748c6 100644 (file)
--- a/camel/camel-vee-folder.c
+++ b/camel/camel-vee-folder.c
@@ -1533,12 +1533,14 @@ folder_changed_change(CamelSession *session, CamelSessionThreadMsg *msg)
        }
 
        CAMEL_VEE_FOLDER_LOCK(vf, summary_lock);
-       if (matches_changed || matches_added || changes->uid_removed->len||present)
-               camel_db_begin_transaction (folder->parent_store->cdb_w, NULL);
 
        if (folder_unmatched != NULL)
                CAMEL_VEE_FOLDER_LOCK(folder_unmatched, summary_lock);
 
+       if (matches_changed || matches_added || changes->uid_removed->len||present)
+               camel_db_begin_transaction (folder->parent_store->cdb_w, NULL);
+
+
        dd(printf("Vfolder '%s' subfolder changed '%s'\n", folder->full_name, sub->full_name));
        dd(printf(" changed %u added %u removed %u\n", changes->uid_changed->len, changes->uid_added->len, changes->uid_removed->len));