* Fixes NB#97355, email is launched properly even though there are account data corru...
[modest] / src / widgets / modest-account-view.c
index 40bc5bf..5408a61 100644 (file)
 #include <modest-tny-account.h>
 #include <modest-text-utils.h>
 #include <modest-runtime.h>
+#include <modest-signal-mgr.h>
 
 #include <gtk/gtkcellrenderertoggle.h>
 #include <gtk/gtkcellrenderertext.h>
 #include <gtk/gtktreeselection.h>
 #include <gtk/gtkliststore.h>
 #include <string.h> /* For strcmp(). */
+#include <modest-account-mgr-helpers.h>
+#include <modest-datetime-formatter.h>
 
 /* 'private'/'protected' functions */
 static void modest_account_view_class_init    (ModestAccountViewClass *klass);
@@ -48,7 +51,20 @@ static void modest_account_view_init          (ModestAccountView *obj);
 static void modest_account_view_finalize      (GObject *obj);
 
 static void modest_account_view_select_account (ModestAccountView *account_view, 
-       const gchar* account_name);
+                                               const gchar* account_name);
+
+static void on_default_account_changed         (ModestAccountMgr *mgr,
+                                               gpointer user_data);
+
+static void on_display_name_changed            (ModestAccountMgr *self, 
+                                               const gchar *account,
+                                               gpointer user_data);
+
+static void modest_account_view_select_first_account (ModestAccountView *account_view);
+
+static void on_account_updated (ModestAccountMgr* mgr, gchar* account_name,
+                    gpointer user_data);
+static void update_account_view (ModestAccountMgr *account_mgr, ModestAccountView *view);
 
 typedef enum {
        MODEST_ACCOUNT_VIEW_NAME_COLUMN,
@@ -65,9 +81,10 @@ typedef struct _ModestAccountViewPrivate ModestAccountViewPrivate;
 struct _ModestAccountViewPrivate {
        ModestAccountMgr *account_mgr;
 
+       ModestDatetimeFormatter *datetime_formatter;
+
        /* Signal handlers */
-       gulong acc_inserted_handler, acc_removed_handler,
-               acc_busy_changed_handler, acc_changed_handler;
+       GSList *sig_handlers;
 };
 #define MODEST_ACCOUNT_VIEW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                  MODEST_TYPE_ACCOUNT_VIEW, \
@@ -112,17 +129,34 @@ modest_account_view_class_init (ModestAccountViewClass *klass)
 }
 
 static void
+datetime_format_changed (ModestDatetimeFormatter *formatter,
+                        ModestAccountView *self)
+{
+       ModestAccountViewPrivate *priv;
+       
+       priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
+       update_account_view (priv->account_mgr, self);
+}
+
+static void
 modest_account_view_init (ModestAccountView *obj)
 {
        ModestAccountViewPrivate *priv;
        
        priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(obj);
        
-       priv->account_mgr = NULL; 
-       priv->acc_inserted_handler = 0;
-       priv->acc_removed_handler = 0;
-       priv->acc_busy_changed_handler = 0;
-       priv->acc_changed_handler = 0;
+       priv->sig_handlers = NULL;
+
+       priv->datetime_formatter = modest_datetime_formatter_new ();
+       g_signal_connect (G_OBJECT (priv->datetime_formatter), "format-changed", 
+                         G_CALLBACK (datetime_format_changed), (gpointer) obj);
+#ifdef MODEST_TOOLKIT_HILDON2
+       gtk_rc_parse_string ("style \"fremantle-modest-account-view\" {\n"
+                            "  GtkWidget::hildon-mode = 1\n"
+                            "} widget \"*.fremantle-modest-account-view\" style \"fremantle-modest-account-view\""
+                            "widget_class \"*<HildonPannableArea>.ModestAccountView\" style :highest \"fremantle-modest-account-view\"");
+       
+#endif
 }
 
 static void
@@ -132,26 +166,15 @@ modest_account_view_finalize (GObject *obj)
 
        priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(obj);
 
-       if (priv->account_mgr) {
-               if (g_signal_handler_is_connected (modest_runtime_get_account_store (),
-                                                  priv->acc_inserted_handler))
-                       g_signal_handler_disconnect (modest_runtime_get_account_store (), 
-                                                    priv->acc_inserted_handler);
+       if (priv->datetime_formatter) {
+               g_object_unref (priv->datetime_formatter);
+               priv->datetime_formatter = NULL;
+       }
 
-               if (g_signal_handler_is_connected (modest_runtime_get_account_store (),
-                                                  priv->acc_removed_handler))
-                       g_signal_handler_disconnect (modest_runtime_get_account_store (), 
-                                                    priv->acc_removed_handler);
-               
-               if (g_signal_handler_is_connected (modest_runtime_get_account_store (),
-                                                  priv->acc_changed_handler))
-                       g_signal_handler_disconnect (modest_runtime_get_account_store (), 
-                                                    priv->acc_changed_handler);
-               
-               if (priv->acc_busy_changed_handler)
-                       g_signal_handler_disconnect (priv->account_mgr, priv->acc_busy_changed_handler);
+       /* Disconnect signals */
+       modest_signal_mgr_disconnect_all_and_destroy (priv->sig_handlers);
 
-               
+       if (priv->account_mgr) {        
                g_object_unref (G_OBJECT(priv->account_mgr));
                priv->account_mgr = NULL; 
        }
@@ -159,22 +182,36 @@ modest_account_view_finalize (GObject *obj)
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
-/* Get the string for the last updated time. Result must be g_freed */
-static gchar*
-get_last_updated_string(ModestAccountMgr* account_mgr, ModestAccountData *account_data)
+/* Get the string for the last updated time. Result must NOT be g_freed */
+static const gchar*
+get_last_updated_string(ModestAccountView *self, ModestAccountMgr* account_mgr, ModestAccountSettings *settings)
 {
        /* FIXME: let's assume that 'last update' applies to the store account... */
-       gchar* last_updated_string;
-       time_t last_updated = account_data->store_account->last_updated;
-       if (!modest_account_mgr_account_is_busy(account_mgr, account_data->account_name)) {
-               if (last_updated > 0) 
-                       last_updated_string = modest_text_utils_get_display_date(last_updated);
-               else
-                       last_updated_string = g_strdup (_("mcen_va_never"));
+       const gchar *last_updated_string;
+       const gchar *store_account_name;
+       const gchar *account_name;
+       time_t last_updated;
+       ModestServerAccountSettings *server_settings;
+       ModestAccountViewPrivate *priv;
+
+       priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE (self);
+       server_settings = modest_account_settings_get_store_settings (settings);
+       store_account_name = modest_server_account_settings_get_account_name (server_settings);
+       last_updated = modest_account_mgr_get_last_updated (account_mgr, store_account_name);
+       g_object_unref (server_settings);
+       account_name = modest_account_settings_get_account_name (settings);
+       if (!modest_account_mgr_account_is_busy(account_mgr, account_name)) {
+               if (last_updated > 0) {
+                       last_updated_string = 
+                               modest_datetime_formatter_display_datetime (priv->datetime_formatter,
+                                                                          last_updated);
+               } else {
+                       last_updated_string = _("mcen_va_never");
+               }
        } else  {
-               /* FIXME: There should be a logical name in the UI specs */
-               last_updated_string = g_strdup(_("..."));
+               last_updated_string = _("mcen_va_refreshing");
        }
+       
        return last_updated_string;
 }
 
@@ -206,41 +243,67 @@ update_account_view (ModestAccountMgr *account_mgr, ModestAccountView *view)
 
        while (cursor) {
                gchar *account_name;
-               ModestAccountData *account_data;
+               ModestAccountSettings *settings;
+               ModestServerAccountSettings *store_settings;
                
                account_name = (gchar*)cursor->data;
                
-               account_data = modest_account_mgr_get_account_data (account_mgr, account_name);
-               if (!account_data) {
+               settings = modest_account_mgr_load_account_settings (account_mgr, account_name);
+               if (!settings) {
                        g_printerr ("modest: failed to get account data for %s\n", account_name);
+                       cursor = cursor->next;
                        continue;
                }
+               store_settings = modest_account_settings_get_store_settings (settings);
 
                /* don't display accounts without stores */
-               if (account_data->store_account) {
+               if (modest_server_account_settings_get_account_name (store_settings) != NULL) {
 
                        GtkTreeIter iter;
+
+                       /* don't free */
+                       const gchar *last_updated_string = get_last_updated_string(view, account_mgr, settings);
                        
-                       gchar *last_updated_string = get_last_updated_string(account_mgr, account_data);
-                       
-                       if (account_data->is_enabled) {
+                       if (modest_account_settings_get_enabled (settings)) {
+                               ModestProtocolType protocol_type;
+                               ModestProtocolRegistry *protocol_registry;
+                               ModestProtocol *protocol;
+                               const gchar *proto_name;
+#ifdef MODEST_TOOLKIT_HILDON2
+                               gchar *last_updated_hildon2;
+
+                               last_updated_hildon2 = g_strconcat ("<span size='x-small'>", _("mcen_ti_lastupdated"), "\n", 
+                                                                  last_updated_string, "</span>",
+                                                                  NULL);
+#endif
+                               protocol_registry = modest_runtime_get_protocol_registry ();
+                               protocol_type = modest_server_account_settings_get_protocol (store_settings);
+                               protocol = modest_protocol_registry_get_protocol_by_type (protocol_registry, protocol_type);
+                               proto_name = modest_protocol_get_name (protocol);
                                gtk_list_store_insert_with_values (
                                        model, &iter, 0,
-                                       MODEST_ACCOUNT_VIEW_NAME_COLUMN,          account_name,
-                                       MODEST_ACCOUNT_VIEW_DISPLAY_NAME_COLUMN,  account_data->display_name,
-                                       MODEST_ACCOUNT_VIEW_IS_ENABLED_COLUMN,    account_data->is_enabled,
-                                       MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN,    account_data->is_default,
-
-                                       MODEST_ACCOUNT_VIEW_PROTO_COLUMN,
-                                       modest_protocol_info_get_transport_store_protocol_name (account_data->store_account->proto),
-       
+                                       MODEST_ACCOUNT_VIEW_NAME_COLUMN, account_name,
+                                       MODEST_ACCOUNT_VIEW_DISPLAY_NAME_COLUMN, 
+                                       modest_account_settings_get_display_name (settings),
+                                       MODEST_ACCOUNT_VIEW_IS_ENABLED_COLUMN, 
+                                       modest_account_settings_get_enabled (settings),
+                                       MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, 
+                                       modest_account_settings_get_is_default (settings),
+                                       MODEST_ACCOUNT_VIEW_PROTO_COLUMN, proto_name,
+#ifdef MODEST_TOOLKIT_HILDON2
+                                       MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN,  last_updated_hildon2,
+#else
                                        MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN,  last_updated_string,
+#endif
                                        -1);
+#ifdef MODEST_TOOLKIT_HILDON2
+                               g_free (last_updated_hildon2);
+#endif
                        }
-                       g_free (last_updated_string);
                }
-
-               modest_account_mgr_free_account_data (account_mgr, account_data);
+               
+               g_object_unref (store_settings);
+               g_object_unref (settings);
                cursor = cursor->next;
        }
 
@@ -251,6 +314,8 @@ update_account_view (ModestAccountMgr *account_mgr, ModestAccountView *view)
        if (selected_name) {
                modest_account_view_select_account (view, selected_name);
                g_free (selected_name);
+       } else {
+               modest_account_view_select_first_account (view);
        }
 }
 
@@ -262,30 +327,49 @@ on_account_busy_changed(ModestAccountMgr *account_mgr,
 {
        GtkListStore *model = GTK_LIST_STORE(gtk_tree_view_get_model (GTK_TREE_VIEW(self)));
        GtkTreeIter iter;
-       g_message(__FUNCTION__);
+       gboolean found = FALSE;
+
        if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &iter))
                return;
-       do
-       {
+
+       do {
                gchar* cur_name;
-               gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, MODEST_ACCOUNT_VIEW_NAME_COLUMN, 
-                                                                                        &cur_name, -1);
-               if (g_str_equal(cur_name, account_name))
-               {
-                       ModestAccountData* account_data = 
-                               modest_account_mgr_get_account_data (account_mgr, account_name);
-                       if (!account_data)
+               gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, 
+                                  MODEST_ACCOUNT_VIEW_NAME_COLUMN, 
+                                  &cur_name, -1);
+
+               if (g_str_equal(cur_name, account_name)) {
+                       ModestAccountSettings* settings = 
+                               modest_account_mgr_load_account_settings (account_mgr, account_name);
+                       if (!settings) {
+                               g_free (cur_name);
                                return;
-                       gchar* last_updated_string = get_last_updated_string(account_mgr, account_data);
+                       }
+                       const gchar* last_updated_string = get_last_updated_string(self, account_mgr, settings);
+#ifdef MODEST_TOOLKIT_HILDON2
+                       gchar *last_updated_hildon2;
+
+                       last_updated_hildon2 = g_strconcat ("<span size='x-small'>", _("mcen_ti_lastupdated"), "\n", 
+                                                           last_updated_string, "</span>",
+                                                           NULL);
+#endif
                        gtk_list_store_set(model, &iter, 
+#ifdef MODEST_TOOLKIT_HILDON2
+                                          MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN, last_updated_hildon2,
+#else
                                           MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN, last_updated_string,
+#endif
                                           -1);
-                       g_free (last_updated_string);
-                       modest_account_mgr_free_account_data (account_mgr, account_data);
-                       return;
+
+#ifdef MODEST_TOOLKIT_HILDON2
+                       g_free (last_updated_hildon2);
+#endif
+                       g_object_unref (settings);
+                       found = TRUE;
                }
-       }
-       while (gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &iter));
+               g_free (cur_name);
+
+       } while (!found && gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &iter));
 }
 
 static void
@@ -313,56 +397,29 @@ on_account_removed (TnyAccountStore *account_store,
 {
        ModestAccountView *self;
        ModestAccountViewPrivate *priv;
+       gchar *selected_name;
 
        g_return_if_fail (MODEST_IS_ACCOUNT_VIEW (user_data));
 
        self = MODEST_ACCOUNT_VIEW (user_data);
        priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE (self);
 
-       update_account_view (priv->account_mgr, self);
-}
-
-
-static void
-on_account_changed (TnyAccountStore *account_store, 
-                   TnyAccount *account,
-                   gpointer user_data)
-{
-       ModestAccountView *self = NULL;
-       ModestAccountViewPrivate *priv = NULL;
-
-       g_return_if_fail (MODEST_IS_ACCOUNT_VIEW (user_data));
-       g_return_if_fail (account);
-       g_return_if_fail (TNY_IS_ACCOUNT (account));
-
-       self = MODEST_ACCOUNT_VIEW (user_data);
-       priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE (self);
+       /* Do not refresh the view with transport accounts */
+       if (!TNY_IS_STORE_ACCOUNT (account))
+               return;
        
-       g_warning ("account changed: %s", tny_account_get_id(account));
+       selected_name = modest_account_view_get_selected_account (self);
+       if (selected_name == NULL) {
+               /* we select the first account if none is selected */
+               modest_account_view_select_first_account (self);                
+       } else {
+               g_free (selected_name);
+       }
        
-       /* Update account view */
-/*     update_account_view (priv->account_mgr, self); */
+       update_account_view (priv->account_mgr, self);
 }
 
 
-
-static gboolean
-find_default_account(ModestAccountView *self, GtkTreeIter *iter)
-{
-       GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
-       gboolean result;
-       for (result = gtk_tree_model_get_iter_first(model, iter);
-            result == TRUE; result = gtk_tree_model_iter_next(model, iter))
-       {
-               gboolean is_default;
-               gtk_tree_model_get (model, iter, MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, &is_default, -1);
-               if(is_default)
-                       return TRUE;
-       }
-
-       return FALSE;
-}
-
 static void
 on_account_default_toggled (GtkCellRendererToggle *cell_renderer, 
                            gchar *path,
@@ -388,20 +445,27 @@ on_account_default_toggled (GtkCellRendererToggle *cell_renderer,
                            MODEST_ACCOUNT_VIEW_NAME_COLUMN, 
                            &account_name, -1);
 
-       /* Set this previously-non-default account as the default */
-       if (modest_account_mgr_set_default_account (priv->account_mgr, account_name)) {
-               GtkTreeIter old_default_iter;
-
-               find_default_account (self, &old_default_iter);
-               gtk_list_store_set (GTK_LIST_STORE (model), &old_default_iter,
-                                   MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, FALSE, -1);
+       /* Set this previously-non-default account as the
+          default. We're not updating here the value of the
+          DEFAULT_COLUMN because we'll do it in the
+          "default_account_changed" signal handler. We do it like
+          this because that way the signal handler is useful also
+          when we're inserting a new account and there is no other
+          one defined, in that case the change of account is provoked
+          by the account mgr and not by a signal toggle.*/
+       modest_account_mgr_set_default_account (priv->account_mgr, account_name);
 
-               gtk_list_store_set (GTK_LIST_STORE (model), &iter,
-                                   MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, TRUE, -1);
-       }
        g_free (account_name);
 }
 
+static void
+on_account_updated (ModestAccountMgr* mgr,
+                    gchar* account_name,
+                    gpointer user_data)
+{
+       update_account_view (mgr, MODEST_ACCOUNT_VIEW (user_data));
+}
+
 void
 bold_if_default_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
                            GtkTreeModel *tree_model,  GtkTreeIter *iter,  gpointer user_data)
@@ -443,13 +507,19 @@ init_view (ModestAccountView *self)
 
        toggle_renderer = gtk_cell_renderer_toggle_new ();
        text_renderer = gtk_cell_renderer_text_new ();
+       g_object_set (G_OBJECT (text_renderer), "ellipsize", PANGO_ELLIPSIZE_END,
+                       "ellipsize-set", TRUE, NULL);
 
        /* the is_default column */
        g_object_set (G_OBJECT(toggle_renderer), "activatable", TRUE, "radio", TRUE, NULL);
+       column = gtk_tree_view_column_new_with_attributes 
+               (_("mcen_ti_default"), toggle_renderer,
+                "active", MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, NULL);
        gtk_tree_view_append_column (GTK_TREE_VIEW(self),
-                                    gtk_tree_view_column_new_with_attributes (
-                                            _("mcen_ti_default"), toggle_renderer,
-                                            "active", MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, NULL));
+                                    column);
+#ifdef MODEST_TOOLKIT_HILDON2
+       gtk_tree_view_column_set_visible (column, FALSE);
+#endif
                                        
        /* Disable the Maemo GtkTreeView::allow-checkbox-mode Maemo modification, 
         * which causes the model column to be updated automatically when the row is clicked.
@@ -463,44 +533,78 @@ init_view (ModestAccountView *self)
        g_object_set(G_OBJECT(toggle_renderer), "checkbox-mode", FALSE, NULL);
 #endif /* MODEST_HAVE_HILDON0_WIDGETS */
 
-       g_signal_connect (G_OBJECT(toggle_renderer), "toggled", 
-                         G_CALLBACK(on_account_default_toggled),
-                         self);
+       priv->sig_handlers = 
+               modest_signal_mgr_connect (priv->sig_handlers,
+                                          G_OBJECT(toggle_renderer), 
+                                          "toggled", 
+                                          G_CALLBACK(on_account_default_toggled),
+                                          self);
        
        /* account name */
        column =  gtk_tree_view_column_new_with_attributes (_("mcen_ti_account"), text_renderer, "text",
                                                            MODEST_ACCOUNT_VIEW_DISPLAY_NAME_COLUMN, NULL);
        gtk_tree_view_append_column (GTK_TREE_VIEW(self), column);
+       gtk_tree_view_column_set_expand (column, TRUE);
        gtk_tree_view_column_set_cell_data_func(column, text_renderer, bold_if_default_cell_data,
                                                NULL, NULL);
 
        /* last update for this account */
-       column =  gtk_tree_view_column_new_with_attributes (_("mcen_ti_lastupdated"), text_renderer,"text",
+       text_renderer = gtk_cell_renderer_text_new ();
+       g_object_set (G_OBJECT (text_renderer), 
+                     "alignment", PANGO_ALIGN_RIGHT, 
+                     "xalign", 1.0,
+                     NULL);
+
+       column =  gtk_tree_view_column_new_with_attributes (_("mcen_ti_lastupdated"), text_renderer,"markup",
                                                            MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN, NULL);
        gtk_tree_view_append_column (GTK_TREE_VIEW(self),column);
+       gtk_tree_view_column_set_expand (column, FALSE);
        gtk_tree_view_column_set_cell_data_func(column, text_renderer, bold_if_default_cell_data,
                                                NULL, NULL);
                        
        /* Show the column headers,
         * which does not seem to be the default on Maemo.
-        */                     
+        */
+#ifndef MODEST_TOOLKIT_HILDON2
        gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self), TRUE);
-
-       priv->acc_removed_handler = g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()),
-                                                     "account_removed",
-                                                     G_CALLBACK(on_account_removed), self);
-
-       priv->acc_inserted_handler = g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()),
-                                                      "account_inserted",
-                                                      G_CALLBACK(on_account_inserted), self);
-
-       priv->acc_changed_handler = g_signal_connect (G_OBJECT (modest_runtime_get_account_store ()),
-                                                      "account_changed",
-                                                      G_CALLBACK(on_account_changed), self);
-
-       priv->acc_busy_changed_handler = g_signal_connect (G_OBJECT(priv->account_mgr),
-                                                          "account_busy_changed",
-                                                          G_CALLBACK(on_account_busy_changed), self);
+#endif
+
+       priv->sig_handlers = 
+               modest_signal_mgr_connect (priv->sig_handlers, 
+                                          G_OBJECT (modest_runtime_get_account_store ()),
+                                          "account_removed",
+                                          G_CALLBACK(on_account_removed), 
+                                          self);
+       priv->sig_handlers = 
+               modest_signal_mgr_connect (priv->sig_handlers, 
+                                          G_OBJECT (modest_runtime_get_account_store ()),
+                                          "account_inserted",
+                                          G_CALLBACK(on_account_inserted), 
+                                          self);
+       priv->sig_handlers = 
+               modest_signal_mgr_connect (priv->sig_handlers, 
+                                          G_OBJECT(priv->account_mgr),
+                                          "account_busy_changed",
+                                          G_CALLBACK(on_account_busy_changed), 
+                                          self);
+       priv->sig_handlers = 
+               modest_signal_mgr_connect (priv->sig_handlers, 
+                                          G_OBJECT(priv->account_mgr),
+                                          "default_account_changed",
+                                          G_CALLBACK(on_default_account_changed), 
+                                          self);
+       priv->sig_handlers = 
+               modest_signal_mgr_connect (priv->sig_handlers, 
+                                          G_OBJECT(priv->account_mgr),
+                                          "display_name_changed",
+                                          G_CALLBACK(on_display_name_changed), 
+                                          self);
+       priv->sig_handlers = 
+                       modest_signal_mgr_connect (priv->sig_handlers,
+                                                  G_OBJECT (priv->account_mgr),
+                                                  "account_updated", 
+                                                  G_CALLBACK (on_account_updated),
+                                                  self);
 }
 
 
@@ -512,7 +616,11 @@ modest_account_view_new (ModestAccountMgr *account_mgr)
        
        g_return_val_if_fail (account_mgr, NULL);
        
-       obj  = g_object_new(MODEST_TYPE_ACCOUNT_VIEW, NULL);
+       obj  = g_object_new(MODEST_TYPE_ACCOUNT_VIEW, 
+#ifdef MODEST_TOOLKIT_HILDON2
+                           "hildon-ui-mode", HILDON_UI_MODE_NORMAL,
+#endif
+                           NULL);
        priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(obj);
        
        g_object_ref (G_OBJECT (account_mgr));
@@ -544,6 +652,25 @@ modest_account_view_get_selected_account (ModestAccountView *self)
        return account_name;
 }
 
+gchar *
+modest_account_view_get_path_account (ModestAccountView *self, GtkTreePath *path)
+{
+       gchar *account_name = NULL;
+       GtkTreeModel *model;
+       GtkTreeIter iter;
+
+       g_return_val_if_fail (MODEST_IS_ACCOUNT_VIEW (self), NULL);
+
+       model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+       if (gtk_tree_model_get_iter (model, &iter, path)) {
+               gtk_tree_model_get (model, &iter, 
+                                   MODEST_ACCOUNT_VIEW_NAME_COLUMN, 
+                                   &account_name, -1);
+       }
+
+       return account_name;
+}
+
 /* This allows us to pass more than one piece of data to the signal handler,
  * and get a result: */
 typedef struct 
@@ -576,9 +703,13 @@ on_model_foreach_select_account(GtkTreeModel *model,
        return FALSE; /* Keep walking the tree. */
 }
 
-static void modest_account_view_select_account (ModestAccountView *account_view, 
-       const gchar* account_name)
+static void 
+modest_account_view_select_account (ModestAccountView *account_view, 
+                                   const gchar* account_name)
 {      
+#ifdef MODEST_TOOLKIT_HILDON2
+       return;
+#endif
        /* Create a state instance so we can send two items of data to the signal handler: */
        ForEachData *state = g_new0 (ForEachData, 1);
        state->self = account_view;
@@ -592,3 +723,63 @@ static void modest_account_view_select_account (ModestAccountView *account_view,
        g_free (state);
 }
 
+static void
+modest_account_view_select_first_account (ModestAccountView *account_view)
+{
+       GtkTreeIter iter;
+       GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (account_view));
+
+       if (gtk_tree_model_get_iter_first (model, &iter)) {
+               GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (account_view));
+       
+               gtk_tree_selection_select_iter (selection, &iter);
+       }
+}
+
+static void
+on_default_account_changed (ModestAccountMgr *mgr,
+                           gpointer user_data)
+{
+       GtkTreeIter iter;
+       gchar *default_account_name;
+       GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (user_data));
+
+       if (!gtk_tree_model_get_iter_first(model, &iter))
+               return;
+
+       default_account_name = modest_account_mgr_get_default_account (mgr);
+
+       do {
+               gboolean is_default;
+               gchar *name;
+
+               gtk_tree_model_get (model, &iter, 
+                                   MODEST_ACCOUNT_VIEW_NAME_COLUMN, &name,
+                                   MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, &is_default, 
+                                   -1);
+
+               /* Update the default account column */
+               if ((default_account_name != NULL) && (!strcmp (name, default_account_name)))
+                       gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+                                           MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, TRUE, -1);
+               else
+                       gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+                                           MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, FALSE, -1);
+
+               g_free (name);
+
+       } while (gtk_tree_model_iter_next(model, &iter));
+
+       /* Free and force a redraw */
+       g_free (default_account_name);
+       gtk_widget_queue_draw (GTK_WIDGET (user_data));
+}
+
+static void 
+on_display_name_changed (ModestAccountMgr *mgr, 
+                        const gchar *account,
+                        gpointer user_data)
+{
+       /* Update the view */
+       update_account_view (mgr, MODEST_ACCOUNT_VIEW (user_data));
+}