Set the active account on creating folder window from mailboxes window,

[modest] / src / widgets / modest-mailboxes-window.c

diff --git a/src/widgets/modest-mailboxes-window.c b/src/widgets/modest-mailboxes-window.c
index 8d9891f..89df684 100644 (file)
--- a/src/widgets/modest-mailboxes-window.c
+++ b/src/widgets/modest-mailboxes-window.c
@@ -300,7 +300,7 @@ modest_mailboxes_window_new (const gchar *account)
        priv->folder_view  = modest_platform_create_folder_view (NULL);
 #ifdef MODEST_TOOLKIT_HILDON2
        live_search = modest_folder_view_setup_live_search (MODEST_FOLDER_VIEW (priv->folder_view));
-       hildon_live_search_widget_hook (HILDON_LIVE_SEARCH (live_search), GTK_WIDGET (self), GTK_TREE_VIEW (priv->folder_view));
+       hildon_live_search_widget_hook (HILDON_LIVE_SEARCH (live_search), GTK_WIDGET (self), priv->folder_view);
 #endif
        modest_folder_view_set_cell_style (MODEST_FOLDER_VIEW (priv->folder_view),
                                           MODEST_FOLDER_VIEW_CELL_STYLE_COMPACT);
@@ -475,6 +475,8 @@ on_mailbox_activated (ModestFolderView *mailboxes_view,
                return;
 
        new_window = GTK_WIDGET (modest_folder_window_new (NULL));
+       active_account = modest_window_get_active_account (MODEST_WINDOW (self));
+       modest_window_set_active_account (MODEST_WINDOW (self), active_account);
        registered = modest_window_mgr_register_window (modest_runtime_get_window_mgr (), 
                                                        MODEST_WINDOW (new_window),
                                                        MODEST_WINDOW (self));