From: Jose Dapena Paz <jdapena@igalia.com>
Date: Wed, 14 Oct 2009 08:52:42 +0000 (+0200)
Subject: Don't run dispose freeing the folder view, as this could cause problems with
X-Git-Tag: 3.1.3~2
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=16a37a60d26dd062ffdf4f2b7d5c70cebf7a5c32

Don't run dispose freeing the folder view, as this could cause problems with
the list store.
---

diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c
index 3b7604a..50e7672 100644
--- a/src/hildon2/modest-folder-window.c
+++ b/src/hildon2/modest-folder-window.c
@@ -246,6 +246,11 @@ modest_folder_window_dispose (GObject *obj)
 			}
 			g_object_unref (iter);
 		}
+
+		if (list && TNY_IS_GTK_FOLDER_LIST_STORE (list)) {
+			g_object_run_dispose (G_OBJECT (list));
+		}
+
 		g_object_unref (list);
 	}	
 
diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index bed885b..b5ce7c8 100644
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -1374,10 +1374,6 @@ modest_folder_view_dispose (GObject *obj)
 	get_inner_models (MODEST_FOLDER_VIEW (obj),
 			  NULL, NULL, &model);
 
-	if (model && TNY_IS_GTK_FOLDER_LIST_STORE (model)) {
-		g_object_run_dispose (G_OBJECT (model));
-	}
-
 #ifdef MODEST_TOOLKIT_HILDON2
 	if (priv->signal_handlers) {
 		modest_signal_mgr_disconnect_all_and_destroy (priv->signal_handlers);