* Fixes NB#78699, there was a missing refilter before selecting the new folder

	* Fixed a reference leak reported by pvanhoof

pmo-trunk-r3948

diff --git a/src/maemo/modest-platform.c b/src/maemo/modest-platform.c
index 512ee1b..e979697 100644 (file)
--- a/src/maemo/modest-platform.c
+++ b/src/maemo/modest-platform.c
@@ -1592,7 +1592,6 @@ modest_platform_create_folder_view (TnyFolderStoreQuery *query)
        modest_folder_view_set_style (MODEST_FOLDER_VIEW (widget),
                                      MODEST_FOLDER_VIEW_STYLE_SHOW_ONE);
 
-
        /* Restore settings */
        modest_widget_memory_restore (modest_runtime_get_conf(), 
                                      G_OBJECT (widget),

diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index 9c91ea0..4a4c4d1 100644 (file)
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -1680,7 +1680,8 @@ on_account_disconnect_when_removing (TnyCamelAccount *account,
 }
 
 static void
-on_account_removed (ModestAccountMgr *acc_mgr, const gchar *account,
+on_account_removed (ModestAccountMgr *acc_mgr, 
+                   const gchar *account,
                    gpointer user_data)
 {
        TnyAccount *store_account = NULL, *transport_account = NULL;

diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c
index 8a7c0b6..c7880c5 100644 (file)
--- a/src/modest-tny-msg.c
+++ b/src/modest-tny-msg.c
@@ -648,7 +648,8 @@ modest_tny_msg_get_header (TnyMsg *msg, const gchar *header)
                TnyPair *pair = (TnyPair*)tny_iterator_get_current(iter);
                if (strcasecmp (header, tny_pair_get_name(pair)) == 0)
                        val = g_strdup (tny_pair_get_value(pair));
-               
+               g_object_unref (pair);          
+
                tny_iterator_next (iter);
        }
 

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index e01d0e2..07e1f81 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -2906,6 +2906,10 @@ modest_folder_view_select_folder (ModestFolderView *self, TnyFolder *folder,
        if (!model)
                return FALSE;
 
+
+       /* Refilter the model, before selecting the folder */
+       gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
+
        if (!gtk_tree_model_get_iter_first (model, &iter)) {
                g_warning ("%s: model is empty", __FUNCTION__);
                return FALSE;