This is a manual merge of branch drop split view intro trunk.

[modest] / src / hildon2 / modest-folder-window.c

diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c
index a1295ab..54cc733 100644 (file)
--- a/src/hildon2/modest-folder-window.c
+++ b/src/hildon2/modest-folder-window.c
@@ -42,6 +42,7 @@
 #include <modest-account-mgr-helpers.h>
 #include <modest-defs.h>
 #include <modest-ui-actions.h>
+#include <modest-window.h>
 #include <hildon/hildon-program.h>
 #include <hildon/hildon-banner.h>
 #include <tny-account-store-view.h>
@@ -395,6 +396,9 @@ on_folder_activated (ModestFolderView *folder_view,
        if (!folder)
                return;
 
+       if (!TNY_IS_FOLDER (folder))
+               return;
+
        headerwin = modest_header_window_new (folder);
        modest_window_mgr_register_window (modest_runtime_get_window_mgr (), 
                                           MODEST_WINDOW (headerwin),