evolution-data-server r9347 - trunk/camel

[sragavan svn gnome org]

Author: sragavan
Date: Thu Aug 14 07:00:11 2008
New Revision: 9347
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9347&view=rev

Log:
2008-08-14  Srinivasa Ragavan  <sragavan novell com>

	** Fix for bug #547389

	* camel/camel-vee-folder.c: Fix crash on account search. Unhook the
	signals on finalize.


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	Thu Aug 14 07:00:11 2008
@@ -177,7 +177,7 @@
 camel_vee_folder_add_folder(CamelVeeFolder *vf, CamelFolder *sub)
 {
 	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);
-	int i;
+	int i, cache;
 	CamelVeeFolder *folder_unmatched = vf->parent_vee_store ? vf->parent_vee_store->folder_unmatched : NULL;
 	
 	if (vf == (CamelVeeFolder *)sub) {
@@ -218,8 +218,11 @@
 
 	d(printf("camel_vee_folder_add_folde(%p, %p)\n", vf, sub));
 
-	camel_object_hook_event(sub->summary, "summary_reloaded", summary_reloaded, vf);
-	g_hash_table_insert(vf->loaded, sub, GINT_TO_POINTER(0));
+	cache = camel_folder_summary_cache_size(sub->summary);
+	if (!cache) {
+		camel_object_hook_event(sub->summary, "summary_reloaded", summary_reloaded, vf);
+		g_hash_table_insert(vf->loaded, sub, GINT_TO_POINTER(1));
+	}
 	
 	camel_object_hook_event((CamelObject *)sub, "folder_changed", (CamelObjectEventHookFunc)folder_changed, vf);
 	camel_object_hook_event((CamelObject *)sub, "deleted", (CamelObjectEventHookFunc)subfolder_deleted, vf);
@@ -227,7 +230,7 @@
 
 	((CamelVeeFolderClass *)((CamelObject *)vf)->klass)->add_folder(vf, sub);
 	
-	if (camel_folder_summary_cache_size(sub->summary))
+	if (cache) 
 		summary_reloaded((CamelObject *) sub->summary, (void *)sub->summary, (void *)vf);
 }
 
@@ -1906,8 +1909,10 @@
 		return; 
 
 	/* Kick off a thread to reload flags from the summary */
-	g_hash_table_remove (vf->loaded, summary->folder);
-	camel_object_unhook_event((CamelObject *)o, "summary_reloaded", (CamelObjectEventHookFunc) summary_reloaded, data);
+	if (GPOINTER_TO_INT(g_hash_table_lookup (vf->loaded, summary->folder))) {	
+		g_hash_table_remove (vf->loaded, summary->folder);
+		camel_object_unhook_event((CamelObject *)o, "summary_reloaded", (CamelObjectEventHookFunc) summary_reloaded, data);
+	}
 	
 	m = camel_session_thread_msg_new(session, &folder_flags_ops, sizeof(*m));
 	m->sub = summary->folder;
@@ -2064,7 +2069,7 @@
 	camel_object_unhook_event((CamelObject *)sub, "deleted", (CamelObjectEventHookFunc) subfolder_deleted, vf);
 	camel_object_unhook_event((CamelObject *)sub, "renamed", (CamelObjectEventHookFunc) folder_renamed, vf);
 	if (GPOINTER_TO_INT(g_hash_table_lookup (vf->loaded, sub))) {
-		g_hash_table_remove (vf->loaded, sub);		
+		g_hash_table_remove (vf->loaded, sub);
 		camel_object_unhook_event((CamelObject *)sub->summary, "summary_reloaded", (CamelObjectEventHookFunc) summary_reloaded, vf);
 	}