On opening a new window, if current window is an editor:

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

diff --git a/src/hildon2/modest-accounts-window.c b/src/hildon2/modest-accounts-window.c
index 628329b..497b1d3 100644 (file)
--- a/src/hildon2/modest-accounts-window.c
+++ b/src/hildon2/modest-accounts-window.c
@@ -36,8 +36,7 @@
 #include <modest-signal-mgr.h>
 #include <modest-runtime.h>
 #include <modest-platform.h>
-#include <hildon/hildon-program.h>
-#include <hildon/hildon-button.h>
+#include <hildon/hildon.h>
 #include <modest-maemo-utils.h>
 #include <modest-icon-names.h>
 #include <modest-defs.h>
@@ -48,6 +47,7 @@
 #include <modest-ui-constants.h>
 #include <modest-account-mgr-helpers.h>
 #include <modest-mailboxes-window.h>
+#include <modest-text-utils.h>
 
 
 /* 'private'/'protected' functions */
@@ -218,7 +218,7 @@ connect_signals (ModestAccountsWindow *self)
                                           "progress-list-changed",
                                           G_CALLBACK (on_progress_list_changed), self);
 
-       model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->account_view));
+       model = modest_account_view_get_model (MODEST_ACCOUNT_VIEW (priv->account_view));
 
        priv->sighandlers =
                modest_signal_mgr_connect (priv->sighandlers,
@@ -338,6 +338,7 @@ modest_accounts_window_new_real (void)
        return MODEST_WINDOW(self);
 }
 
+
 ModestWindow *
 modest_accounts_window_new (void)
 {
@@ -345,6 +346,9 @@ modest_accounts_window_new (void)
        ModestWindow *self;
        ModestAccountsWindowPrivate *priv = NULL;
        HildonProgram *app;
+#ifdef MODEST_TOOLKIT_HILDON2
+       GtkWidget *live_search;
+#endif
 
        if (pre_created_accounts_window) {
                self = MODEST_WINDOW (pre_created_accounts_window);
@@ -354,6 +358,11 @@ modest_accounts_window_new (void)
        }
        priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE(self);
        priv->account_view  = GTK_WIDGET (modest_account_view_new (modest_runtime_get_account_mgr ()));
+#ifdef MODEST_TOOLKIT_HILDON2
+       live_search = modest_account_view_setup_live_search (MODEST_ACCOUNT_VIEW (priv->account_view));
+       hildon_live_search_widget_hook (HILDON_LIVE_SEARCH (live_search), GTK_WIDGET (self), priv->account_view);
+       gtk_box_pack_start (GTK_BOX (priv->box), live_search, FALSE, FALSE, 0);
+#endif
 
        action_area_box = hildon_tree_view_get_action_area_box (GTK_TREE_VIEW (priv->account_view));
        gtk_box_pack_start (GTK_BOX (action_area_box), priv->new_message_button, TRUE, TRUE, 0);
@@ -461,6 +470,7 @@ on_account_activated (GtkTreeView *account_view,
        } else {
 
                new_window = GTK_WIDGET (modest_folder_window_new (NULL));
+               modest_window_set_active_account (MODEST_WINDOW (new_window), account_name);
        }
 
        registered = modest_window_mgr_register_window (modest_runtime_get_window_mgr (), 
@@ -579,7 +589,7 @@ row_count_changed (ModestAccountsWindow *self)
        gint count;
 
        priv = MODEST_ACCOUNTS_WINDOW_GET_PRIVATE (self);
-       model = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->account_view));
+       model = modest_account_view_get_model (MODEST_ACCOUNT_VIEW (priv->account_view));
 
        count = gtk_tree_model_iter_n_children (model, NULL);
 
@@ -718,13 +728,11 @@ on_delete_event (GtkWidget *widget,
 
        gdk_window_process_updates (priv->account_view->window, TRUE);
 
-       /* Take screenshot. We have to wait a bit to ensure that
-          screenshot is properly taken */
        hildon_gtk_window_take_screenshot (GTK_WINDOW (widget), TRUE);
-       g_usleep (G_USEC_PER_SEC);
 
        modest_account_view_set_show_last_update (MODEST_ACCOUNT_VIEW (priv->account_view), TRUE);
 
        return FALSE;
 
 }
+