Updated the account window management to the Fremantle style

[modest] / src / widgets / modest-folder-view.c

diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c
index 232959f..d1cc82b 100644 (file)
--- a/src/widgets/modest-folder-view.c
+++ b/src/widgets/modest-folder-view.c
@@ -38,6 +38,7 @@
 #include <tny-gtk-folder-store-tree-model.h>
 #endif
 #include <tny-gtk-header-list-model.h>
+#include <tny-merge-folder.h>
 #include <tny-folder.h>
 #include <tny-folder-store-observer.h>
 #include <tny-account-store.h>
@@ -1409,11 +1410,11 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
                if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE &&
                    !gtk_tree_model_iter_parent (model, iter, &parent)) {
                        /* Only show special folders for current account if needed */
-                       if (TNY_IS_FOLDER (instance)) {
+                       if (TNY_IS_FOLDER (instance) && !TNY_IS_MERGE_FOLDER (instance)) {
                                TnyAccount *account;
 
                                account = tny_folder_get_account (TNY_FOLDER (instance));
-                               
+
                                if (TNY_IS_ACCOUNT (account)) {
                                        const gchar *account_id = tny_account_get_id (account);
 
@@ -1428,7 +1429,7 @@ filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
                                                g_object_unref (account);
                                }
                        }
-                       
+
                }
        }