Modified webpage: now tinymail repository is in gitorious.

[modest] / src / widgets / modest-account-view-window.c

diff --git a/src/widgets/modest-account-view-window.c b/src/widgets/modest-account-view-window.c
index 61d0f31..6c8c502 100644 (file)
--- a/src/widgets/modest-account-view-window.c
+++ b/src/widgets/modest-account-view-window.c
@@ -47,6 +47,9 @@
 #include "widgets/modest-ui-constants.h"
 #include <modest-scrollable.h>
 #include <modest-toolkit-factory.h>
+#ifdef MODEST_TOOLKIT_HILDON2
+#include <hildon/hildon.h>
+#endif
 
 /* 'private'/'protected' functions */
 static void                            modest_account_view_window_class_init   (ModestAccountViewWindowClass *klass);
@@ -128,36 +131,6 @@ modest_account_view_window_finalize (GObject *self)
 }
 
 static void
-on_account_settings_dialog_response (GtkDialog *dialog,
-                                    gint response,
-                                    gpointer user_data)
-{
-       TnyAccount *store_account = NULL;
-       gchar* account_name = NULL;
-       ModestAccountViewWindowPrivate *priv = NULL;
-
-       priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (user_data);
-       account_name = modest_account_view_get_selected_account (priv->account_view);
-       store_account = modest_tny_account_store_get_server_account (modest_runtime_get_account_store (),
-                                                                    account_name,
-                                                                    TNY_ACCOUNT_TYPE_STORE);
-        if (store_account) {
-               /* Reconnect the store account, no need to reconnect the
-                  transport account because it will connect when needed */
-               if (tny_account_get_connection_status (store_account) ==
-                   TNY_CONNECTION_STATUS_DISCONNECTED)
-                       tny_camel_account_set_online (TNY_CAMEL_ACCOUNT (store_account),
-                                                     TRUE, NULL, NULL);
-               g_object_unref (store_account);
-       }
-       /* Disconnect this handler */
-       g_signal_handlers_disconnect_by_func (dialog, on_account_settings_dialog_response, user_data);
-
-       /* Free */
-       g_free (account_name);
-}
-
-static void
 on_account_activated (GtkTreeView *account_view,
                      GtkTreePath *path,
                      GtkTreeViewColumn *column,
@@ -212,12 +185,23 @@ modest_account_view_window_init (ModestAccountViewWindow *self)
        ModestAccountViewWindowPrivate *priv;
        GtkWidget *main_vbox, *scrollable;
        GtkWidget *align;
+#ifdef MODEST_TOOLKIT_HILDON2
+       GtkWidget *live_search;
+#endif
 
+       /* Specify a default size */
+       gtk_window_set_default_size (GTK_WINDOW (self), -1, MODEST_DIALOG_WINDOW_MAX_HEIGHT);
 
+#ifdef MODEST_TOOLKIT_HILDON2
        /* Specify a default size */
        gtk_window_set_default_size (GTK_WINDOW (self), -1, MODEST_DIALOG_WINDOW_MAX_HEIGHT);
+
        gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE);
        gtk_widget_hide (GTK_DIALOG (self)->action_area);
+#else
+       gtk_window_set_default_size (GTK_WINDOW (self), MODEST_DIALOG_WINDOW_MAX_WIDTH, MODEST_DIALOG_WINDOW_MAX_HEIGHT);
+       gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+#endif
 
        
        /* This seems to be necessary to make the window show at the front with decoration.
@@ -229,9 +213,18 @@ modest_account_view_window_init (ModestAccountViewWindow *self)
        priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
        priv->acc_removed_handler = 0;
        priv->account_view = 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), GTK_WIDGET (priv->account_view));
+#endif
+
        modest_account_view_set_picker_mode (MODEST_ACCOUNT_VIEW (priv->account_view), TRUE);
 
        main_vbox = GTK_DIALOG (self)->vbox;
+#ifdef MODEST_TOOLKIT_HILDON2
+       gtk_box_pack_end (GTK_BOX (main_vbox), live_search, FALSE, FALSE, 0);
+#endif
 
        scrollable = modest_toolkit_factory_create_scrollable (modest_runtime_get_toolkit_factory ());
        gtk_widget_show (scrollable);