From: Milan Crha <mcrha@redhat.com>
Date: Wed, 13 Jun 2012 10:16:16 +0000 (+0200)
Subject: Disable cfs_try_release_memory() in dispose, rather than finalize
X-Git-Tag: upstream/3.7.4~783
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ec57923c97ba343e612b914a24a6b4ff64495d70;p=platform%2Fupstream%2Fevolution-data-server.git

Disable cfs_try_release_memory() in dispose, rather than finalize
---

diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index b8daf18..fd9d1d6 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -183,6 +183,11 @@ folder_summary_dispose (GObject *object)
 
 	priv = CAMEL_FOLDER_SUMMARY_GET_PRIVATE (object);
 
+	if (priv->timeout_handle) {
+		g_source_remove (priv->timeout_handle);
+		priv->timeout_handle = 0;
+	}
+
 	if (priv->filter_index != NULL) {
 		g_object_unref (priv->filter_index);
 		priv->filter_index = NULL;
@@ -233,9 +238,6 @@ folder_summary_finalize (GObject *object)
 	CamelFolderSummary *summary = CAMEL_FOLDER_SUMMARY (object);
 	CamelFolderSummaryPrivate *priv = summary->priv;
 
-	if (priv->timeout_handle)
-		g_source_remove (priv->timeout_handle);
-
 	g_hash_table_destroy (priv->uids);
 	g_hash_table_destroy (priv->loaded_infos);