evolution-data-server r9514 - trunk/camel

[sragavan svn gnome org]

Author: sragavan
Date: Wed Sep 10 19:50:48 2008
New Revision: 9514
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9514&view=rev

Log:
2008-09-11  Srinivasa Ragavan  <sragavan novell com>

	* camel-vee-folder.c: (folder_changed_change): Missed another deadlock
	case.




Modified:
   trunk/camel/ChangeLog
   trunk/camel/camel-vee-folder.c

Modified: trunk/camel/camel-vee-folder.c
==============================================================================
--- trunk/camel/camel-vee-folder.c	(original)
+++ trunk/camel/camel-vee-folder.c	Wed Sep 10 19:50:48 2008
@@ -1506,10 +1506,13 @@
 
 		if (changed->len)
 			matches_changed = camel_folder_search_by_uids(sub, vf->expression, changed, NULL);
+		if (always_changed->len)
+			present = camel_folder_search_by_uids(sub, vf->expression, always_changed, NULL);
+
 	}
 
 	CAMEL_VEE_FOLDER_LOCK(vf, summary_lock);
-	if (matches_changed || matches_added || changes->uid_removed->len)
+	if (matches_changed || matches_added || changes->uid_removed->len||(always_changed && always_changed->len))
 		camel_db_begin_transaction (folder->parent_store->cdb, NULL);
 
 	if (folder_unmatched != NULL)
@@ -1561,7 +1564,6 @@
 
 	/* Change any newly changed */
 	if (always_changed) {
-		present = camel_folder_search_by_uids(sub, vf->expression, always_changed, NULL);
 		GHashTable *ht_present = g_hash_table_new (g_str_hash, g_str_equal);
 
 		for (i=0;present && i<present->len;i++) {