evolution-data-server r9517 - trunk/camel

[sragavan svn gnome org]

Author: sragavan
Date: Wed Sep 10 20:22:39 2008
New Revision: 9517
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9517&view=rev

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

	* camel-vee-folder.c: (folder_changed_change): Fix a deadlock




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 20:22:39 2008
@@ -1512,7 +1512,7 @@
 	}
 
 	CAMEL_VEE_FOLDER_LOCK(vf, summary_lock);
-	if (matches_changed || matches_added || changes->uid_removed->len||(always_changed && always_changed->len))
+	if (matches_changed || matches_added || changes->uid_removed->len||present)
 		camel_db_begin_transaction (folder->parent_store->cdb, NULL);
 
 	if (folder_unmatched != NULL)
@@ -1645,7 +1645,7 @@
 		vf->changes = camel_folder_change_info_new();
 	}
 
-	if (matches_changed || matches_added || changes->uid_removed->len || (always_changed && always_changed->len))
+	if (matches_changed || matches_added || changes->uid_removed->len || present)
 		camel_db_end_transaction (folder->parent_store->cdb, NULL);
 	CAMEL_VEE_FOLDER_UNLOCK(vf, summary_lock);