[evolution-data-server/gnome-3-4] Disable cfs_try_release_memory() in dispose, rather than finalize

[Milan Crha <mcrha src gnome org>]

commit be57410db84211ddf94a02dc1cf0eb506a5d6190
Author: Milan Crha <mcrha redhat com>
Date:   Wed Jun 13 12:18:38 2012 +0200

    Disable cfs_try_release_memory() in dispose, rather than finalize

 camel/camel-folder-summary.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index 06f0ccb..8fe89fd 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);