Fixes NB#117911, unable to rename a folder after visiting it.

We're leaking a reference of a filter model that was preventing the TnyFolder from being freed

diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c
index 84f12aa..3310570 100644 (file)
--- a/src/hildon2/modest-folder-window.c
+++ b/src/hildon2/modest-folder-window.c
@@ -506,10 +506,7 @@ on_folder_activated (ModestFolderView *folder_view,
 
        priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self);
 
-       if (!folder)
-               return;
-
-       if (!TNY_IS_FOLDER (folder))
+       if (!folder || !TNY_IS_FOLDER (folder))
                return;
 
        /* We cannot open noselect folders (fake ones) */

diff --git a/src/widgets/modest-header-view.c b/src/widgets/modest-header-view.c
index f4f8781..9753537 100644 (file)
--- a/src/widgets/modest-header-view.c
+++ b/src/widgets/modest-header-view.c
@@ -1157,6 +1157,7 @@ modest_header_view_set_folder_intern (ModestHeaderView *self, TnyFolder *folder)
 
        /* Create sortable model */
        sortable = gtk_tree_model_sort_new_with_model (filter_model);
+       g_object_unref (filter_model);
 
        /* install our special sorting functions */
        cursor = cols = gtk_tree_view_get_columns (GTK_TREE_VIEW(self));