Modified webpage: now tinymail repository is in gitorious.

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

diff --git a/src/widgets/modest-accounts-window.c b/src/widgets/modest-accounts-window.c
index 4ecac47..5fddb8b 100644 (file)
--- a/src/widgets/modest-accounts-window.c
+++ b/src/widgets/modest-accounts-window.c
@@ -83,9 +83,11 @@ static void on_row_deleted (GtkTreeModel *tree_model,
                            GtkTreePath  *path,
                            gpointer      user_data);
 static void row_count_changed (ModestAccountsWindow *self);
+#ifdef MODEST_TOOLKIT_HILDON2
 static gboolean on_key_press(GtkWidget *widget,
-                               GdkEventKey *event,
-                               gpointer user_data);
+                            GdkEventKey *event,
+                            gpointer user_data);
+#endif
 static gboolean on_delete_event (GtkWidget *widget,
                                 GdkEvent *event,
                                 gpointer userdata);
@@ -110,7 +112,7 @@ struct _ModestAccountsWindowPrivate {
                                                                            ModestAccountsWindowPrivate))
 
 /* globals */
-static GtkWindowClass *parent_class = NULL;
+static ModestWindowParentClass *parent_class = NULL;
 static GtkWidget *pre_created_accounts_window = NULL;
 
 /************************************************************************/
@@ -222,7 +224,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,
@@ -247,9 +249,10 @@ connect_signals (ModestAccountsWindow *self)
        /* we don't register this in sighandlers, as it should be run
         * after disconnecting all signals, in destroy stage */
 
-
+#ifdef MODEST_TOOLKIT_HILDON2
        g_signal_connect(G_OBJECT(self), "key-press-event",
                        G_CALLBACK(on_key_press), self);
+#endif
 }
 
 static ModestWindow *
@@ -356,6 +359,7 @@ modest_accounts_window_new_real (void)
        return MODEST_WINDOW(self);
 }
 
+
 ModestWindow *
 modest_accounts_window_new (void)
 {
@@ -363,6 +367,7 @@ modest_accounts_window_new (void)
        ModestAccountsWindowPrivate *priv = NULL;
 #ifdef MODEST_TOOLKIT_HILDON2
        HildonProgram *app;
+       GtkWidget *live_search;
 #endif
 
        if (pre_created_accounts_window) {
@@ -373,6 +378,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
 
 #ifdef MODEST_TOOLKIT_HILDON2
        GtkWidget *action_area_box;
@@ -486,6 +496,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 (), 
@@ -604,7 +615,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);
 
@@ -700,7 +711,7 @@ modest_accounts_window_pre_create (void)
        }
 }
 
-
+#ifdef MODEST_TOOLKIT_HILDON2
 static gboolean
 on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
 {
@@ -727,6 +738,7 @@ on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
 
        return FALSE;
 }
+#endif
 
 static gboolean
 on_delete_event (GtkWidget *widget,
@@ -744,10 +756,7 @@ 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);
 #endif
@@ -755,3 +764,4 @@ on_delete_event (GtkWidget *widget,
        return FALSE;
 
 }
+