[evolution-data-server/gnome-2-30] Bug #617261 - Evolution didn't quit due to deadlock

[Milan Crha <mcrha src gnome org>]

commit ceb691fe562ad46b020d74b0fc20fbf82bc5c995
Author: Milan Crha <mcrha redhat com>
Date:   Thu Jun 10 19:10:48 2010 +0200

    Bug #617261 - Evolution didn't quit due to deadlock

 camel/camel-folder-summary.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 0ab6887..380bd9a 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -1014,6 +1014,8 @@ camel_folder_summary_reload_from_db (CamelFolderSummary *s, CamelException *ex)
 	 * load better. */
 	d(printf ("\ncamel_folder_summary_reload_from_db called \n"));
 
+	CAMEL_SUMMARY_LOCK(s, summary_lock);
+
 	folder_name = s->folder->full_name;
 	cdb = s->folder->parent_store->cdb_r;
 
@@ -1028,6 +1030,8 @@ camel_folder_summary_reload_from_db (CamelFolderSummary *s, CamelException *ex)
 	if (!g_getenv("CAMEL_FREE_INFOS") && !s->timeout_handle)
 		s->timeout_handle = g_timeout_add_seconds (SUMMARY_CACHE_DROP, (GSourceFunc) cfs_try_release_memory, s);
 
+	CAMEL_SUMMARY_UNLOCK(s, summary_lock);
+
 	if (_PRIVATE(s)->need_preview) {
 		struct _preview_update_msg *m;