Modified webpage: now tinymail repository is in gitorious.
[modest] / src / widgets / modest-account-view.c
index b53e10b..1476aa3 100644 (file)
  */
 
 #include <glib/gi18n.h>
+#include <gtk/gtk.h>
 #include "modest-account-view.h"
 
 #include <modest-account-mgr.h>
 #include <modest-account-mgr-helpers.h>
+#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>
+#include <modest-ui-constants.h>
+#ifdef MODEST_TOOLKIT_HILDON2
+#include <hildon/hildon-defines.h>
+#include <hildon/hildon.h>
+#endif
+#ifdef MODEST_USE_LIBTIME
+#include <clockd/libtime.h>
+#endif
 
 /* 'private'/'protected' functions */
 static void modest_account_view_class_init    (ModestAccountViewClass *klass);
 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);
+
+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 on_account_updated (ModestAccountMgr* mgr, gchar* account_name,
+                    gpointer user_data);
+static void update_account_view (ModestAccountMgr *account_mgr, ModestAccountView *view);
+static void on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata);
+static void update_style (ModestAccountView *self);
+static void update_display_mode (ModestAccountView *self);
 
 typedef enum {
        MODEST_ACCOUNT_VIEW_NAME_COLUMN,
@@ -53,27 +79,29 @@ typedef enum {
        MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN,
        MODEST_ACCOUNT_VIEW_PROTO_COLUMN,
        MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN,
+       MODEST_ACCOUNT_VIEW_HAS_NEW_MAILS_COLUMN,
 
        MODEST_ACCOUNT_VIEW_COLUMN_NUM
 } AccountViewColumns;
 
-
-/* list my signals */
-enum {
-       /* MY_SIGNAL_1, */
-       /* MY_SIGNAL_2, */
-       LAST_SIGNAL
-};
-
 typedef struct _ModestAccountViewPrivate ModestAccountViewPrivate;
 struct _ModestAccountViewPrivate {
        ModestAccountMgr *account_mgr;
-       gulong sig1, sig2;
-       
-       /* When this is TRUE, we ignore configuration key changes.
-        * This is useful when making many changes. */
-       gboolean block_conf_updates;
-       
+
+       ModestDatetimeFormatter *datetime_formatter;
+       gboolean picker_mode;
+       gboolean show_last_updated;
+
+       GtkTreeModel *model;
+       GtkTreeModel *filter;
+
+       /* Signal handlers */
+       GSList *sig_handlers;
+
+       GtkTreeViewColumn *account_name_column;
+       GtkCellRenderer *account_name_renderer;
+
+       guint update_account_view_idle_id;
 };
 #define MODEST_ACCOUNT_VIEW_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                  MODEST_TYPE_ACCOUNT_VIEW, \
@@ -81,9 +109,6 @@ struct _ModestAccountViewPrivate {
 /* globals */
 static GtkTreeViewClass *parent_class = NULL;
 
-/* uncomment the following if you have defined any signals */
-/* static guint signals[LAST_SIGNAL] = {0}; */
-
 GType
 modest_account_view_get_type (void)
 {
@@ -121,15 +146,38 @@ modest_account_view_class_init (ModestAccountViewClass *klass)
 }
 
 static void
-modest_account_view_init (ModestAccountView *obj)
+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->sig1 = 0;
-       priv->sig2 = 0;
+       priv->sig_handlers = NULL;
+       priv->update_account_view_idle_id = 0;
+
+       priv->datetime_formatter = modest_datetime_formatter_new ();
+       priv->picker_mode = FALSE;
+       priv->show_last_updated = TRUE;
+       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
+       g_signal_connect (G_OBJECT (obj), "notify::style", G_CALLBACK (on_notify_style), (gpointer) obj);
 }
 
 static void
@@ -139,13 +187,20 @@ modest_account_view_finalize (GObject *obj)
 
        priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(obj);
 
-       if (priv->account_mgr) {
-               if (priv->sig1)
-                       g_signal_handler_disconnect (priv->account_mgr, priv->sig1);
+       if (priv->update_account_view_idle_id > 0) {
+               g_source_remove (priv->update_account_view_idle_id);
+               priv->update_account_view_idle_id = 0;
+       }
+
+       if (priv->datetime_formatter) {
+               g_object_unref (priv->datetime_formatter);
+               priv->datetime_formatter = NULL;
+       }
 
-               if (priv->sig2)
-                       g_signal_handler_disconnect (priv->account_mgr, priv->sig2);
+       /* 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; 
        }
@@ -153,186 +208,375 @@ modest_account_view_finalize (GObject *obj)
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
+/* 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... */
+       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  {
+               last_updated_string = _("mcen_va_refreshing");
+       }
 
+       return last_updated_string;
+}
 
-static void
-update_account_view (ModestAccountMgr *account_mgr, ModestAccountView *view)
+static gboolean
+update_account_view_idle (gpointer userdata)
 {
+       ModestAccountView *view;
+       ModestAccountViewPrivate *priv;
+       ModestAccountMgr *account_mgr;
        GSList *account_names, *cursor;
-       GtkListStore *model;
-               
-       model = GTK_LIST_STORE(gtk_tree_view_get_model (GTK_TREE_VIEW(view)));  
-       gtk_list_store_clear (model);
+
+       view = MODEST_ACCOUNT_VIEW (userdata);
+       priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(view);
+       account_mgr = modest_runtime_get_account_mgr ();
+
+       /* Get the ID of the currently-selected account,
+        * so we can select it again after rebuilding the list.
+        * Note that the name doesn't change even when the display name changes.
+        */
+       gchar *selected_name = modest_account_view_get_selected_account (view);
+
+       gtk_list_store_clear (GTK_LIST_STORE (priv->model));
 
        /* Note: We do not show disabled accounts.
-        * Of course, this means that there is no UI to enable or disable 
-        * accounts. That is OK for maemo where no such feature or UI is 
-        * specified, so the "enabled" property is used internally to avoid 
-        * showing unfinished accounts. If a user-visible "enabled" is 
-        * needed in the future, we must use a second property for the 
+        * Of course, this means that there is no UI to enable or disable
+        * accounts. That is OK for maemo where no such feature or UI is
+        * specified, so the "enabled" property is used internally to avoid
+        * showing unfinished accounts. If a user-visible "enabled" is
+        * needed in the future, we must use a second property for the
         * current use instead */
        cursor = account_names = modest_account_mgr_account_names (account_mgr,
                TRUE /* only enabled accounts. */);
-       
-       if(account_names == NULL)
-       {
-         printf ("debug: modest_account_mgr_account_names() returned  NULL\n");
-       }
 
        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;
-                       time_t last_updated; 
-                       gchar *last_updated_string;
-                       
-                       /* FIXME: let's assume that 'last update' applies to the store account... */
-                       last_updated = account_data->store_account->last_updated;
-                       if (last_updated > 0) 
-                               last_updated_string = modest_text_utils_get_display_date(last_updated);
-                       else
-                               last_updated_string = g_strdup (_("Never"));
+
+                       /* don't free */
+                       const gchar *last_updated_string = get_last_updated_string(view, account_mgr, settings);
+                       gboolean has_new_mails = modest_account_mgr_get_has_new_mails (account_mgr, account_name);
                        
-                       if (account_data->is_enabled) {
+                       if (modest_account_settings_get_enabled (settings)) {
+                               ModestProtocolType protocol_type;
+                               ModestProtocolRegistry *protocol_registry;
+                               ModestProtocol *protocol;
+                               const gchar *proto_name;
+                               gchar *last_updated_hildon2;
+
+                               if (priv->show_last_updated) {
+                                       last_updated_hildon2 = g_strconcat (_("mcen_ti_lastupdated"), "\n", 
+                                                                           last_updated_string,
+                                                                           NULL);
+                               } else {
+                                       last_updated_hildon2 = g_strconcat (_("mcen_ti_lastupdated"), "\n", NULL);
+                               }
+                               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_protocol_name  (account_data->store_account->proto),
-       
-                                       MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN,  last_updated_string,
+                                       GTK_LIST_STORE (priv->model), &iter, 0,
+                                       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,
+                                       MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN,  last_updated_hildon2,
+                                       MODEST_ACCOUNT_VIEW_HAS_NEW_MAILS_COLUMN, has_new_mails,
                                        -1);
-                               g_free (last_updated_string);
+                               g_free (last_updated_hildon2);
                        }
                }
-
-               modest_account_mgr_free_account_data (account_mgr, account_data);
+               
+               g_object_unref (store_settings);
+               g_object_unref (settings);
                cursor = cursor->next;
        }
-       g_slist_free (account_names);
-}
 
-
-static void
-on_account_changed (ModestAccountMgr *account_mgr,
-                   const gchar* account, const gchar* key,
-                   gboolean server_account, ModestAccountView *self)
-{      
-       /* Never update the view in response to gconf changes.
-        * Always do it explicitly instead.
-        * This is because we have no way to avoid 10 updates when changing 
-        * 10 items, and this blocks the UI.
-        *
-        * But this block/unblock API might be useful on platforms where the 
-        * notification does not happen so long after the key was set.
-        * (We have no way to know when the last key was set, to do a final update)..
-        */
-        return;
-        
-       ModestAccountViewPrivate* priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
+       modest_account_mgr_free_account_names (account_names);
+       account_names = NULL;
        
-       if (!priv->block_conf_updates)
-               update_account_view (account_mgr, self);
-}
+       /* Try to re-select the same account: */
+       if (selected_name) {
+               modest_account_view_select_account (view, selected_name);
+               g_free (selected_name);
+       }
 
+       priv->update_account_view_idle_id = 0;
+       return FALSE;
+}
 
 static void
-on_account_removed (ModestAccountMgr *account_mgr,
-                   const gchar* account, gboolean server_account,
-                   ModestAccountView *self)
+update_account_view (ModestAccountMgr *account_mgr, ModestAccountView *view)
 {
-       ModestAccountViewPrivate* priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
-       if (!priv->block_conf_updates)
-               on_account_changed (account_mgr, account, NULL, server_account, self);
+       ModestAccountViewPrivate *priv;
+       priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(view);
+
+       if (priv->update_account_view_idle_id == 0) {
+               priv->update_account_view_idle_id = g_idle_add (update_account_view_idle, (gpointer) view);
+       }
 }
 
 
-/* currently unused */
-#if 0 
 static void
-on_account_enable_toggled (GtkCellRendererToggle *cell_renderer, gchar *path,
-                          ModestAccountView *self)
+on_account_busy_changed(ModestAccountMgr *account_mgr, 
+                        const gchar *account_name,
+                        gboolean busy, 
+                        ModestAccountView *self)
 {
        GtkTreeIter iter;
+       gboolean found = FALSE;
        ModestAccountViewPrivate *priv;
-       GtkTreeModel *model;
-       gchar *account_name;
-       gboolean enabled;
-       
+
        priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
-       model = gtk_tree_view_get_model (GTK_TREE_VIEW(self));
-       
-       if (!gtk_tree_model_get_iter_from_string (model, &iter, path)) {
-               g_printerr ("modest: cannot find iterator\n");
+
+       if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(priv->model), &iter))
                return;
-       }
-       gtk_tree_model_get (model, &iter, MODEST_ACCOUNT_VIEW_IS_ENABLED_COLUMN, &enabled,
-                           MODEST_ACCOUNT_VIEW_NAME_COLUMN, &account_name,
-                           -1);
-       
-       /* toggle enabled / disabled */
-       modest_account_mgr_set_enabled (priv->account_mgr, account_name, !enabled);
-       g_free (account_name);
+
+       do {
+               gchar* cur_name;
+               gtk_tree_model_get(GTK_TREE_MODEL(priv->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;
+                       }
+                       const gchar* last_updated_string = get_last_updated_string(self, account_mgr, settings);
+                       gchar *last_updated_hildon2;
+
+                       last_updated_hildon2 = g_strconcat (_("mcen_ti_lastupdated"), "\n", 
+                                                           last_updated_string,
+                                                           NULL);
+                       gtk_list_store_set(GTK_LIST_STORE (priv->model), &iter, 
+                                          MODEST_ACCOUNT_VIEW_LAST_UPDATED_COLUMN, last_updated_hildon2,
+                                          -1);
+
+                       g_free (last_updated_hildon2);
+                       g_object_unref (settings);
+                       found = TRUE;
+               }
+               g_free (cur_name);
+
+       } while (!found && gtk_tree_model_iter_next(priv->model, &iter));
 }
-#endif
 
 static void
-on_account_default_toggled (GtkCellRendererToggle *cell_renderer, gchar *path,
-                          ModestAccountView *self)
-{
-       gboolean is_default = gtk_cell_renderer_toggle_get_active (cell_renderer);
-       if (is_default) {
-               /* Do not allow an account to be marked non-default.
-                * Only allow this to be changed by setting another account to default: */
-               gtk_cell_renderer_toggle_set_active (cell_renderer, TRUE);
+on_account_inserted (TnyAccountStore *account_store, 
+                    TnyAccount *account,
+                    gpointer user_data)
+{
+       ModestAccountView *self;
+       ModestAccountViewPrivate *priv;
+
+       g_return_if_fail (MODEST_IS_ACCOUNT_VIEW (user_data));
+
+       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))
+               update_account_view (priv->account_mgr, self);
+}
+
+static void
+on_account_removed (TnyAccountStore *account_store, 
+                   TnyAccount *account,
+                   gpointer user_data)
+{
+       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);
+
+       /* Do not refresh the view with transport accounts */
+       if (!TNY_IS_STORE_ACCOUNT (account))
                return;
+       
+       selected_name = modest_account_view_get_selected_account (self);
+       if (selected_name == NULL) {
+       } else {
+               g_free (selected_name);
        }
-
-       ModestAccountViewPrivate *priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
-       GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW(self));
        
+       update_account_view (priv->account_mgr, self);
+}
+
+
+static void
+on_account_default_toggled (GtkCellRendererToggle *cell_renderer, 
+                           gchar *path,
+                           ModestAccountView *self)
+{
+       ModestAccountViewPrivate *priv;
        GtkTreeIter iter;
-       if (!gtk_tree_model_get_iter_from_string (model, &iter, path)) {
-               g_printerr ("modest: cannot find iterator\n");
+       gchar *account_name = NULL;
+
+       g_return_if_fail (MODEST_IS_ACCOUNT_VIEW (self));
+
+       /* If it's active then do nothing, no need to reenable it as
+          default account */
+       if (gtk_cell_renderer_toggle_get_active (cell_renderer))
+               return;
+
+       priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
+
+       if (!gtk_tree_model_get_iter_from_string (priv->filter, &iter, path)) {
+               g_warning ("Got path of a not existing iter");
                return;
        }
        
-       gchar *account_name = NULL;
-       gtk_tree_model_get (model, &iter, MODEST_ACCOUNT_VIEW_NAME_COLUMN, &account_name,
-                           -1);
-       
-       /* Set this previously-non-default account as the default: */
+       gtk_tree_model_get (priv->filter, &iter, 
+                           MODEST_ACCOUNT_VIEW_NAME_COLUMN, 
+                           &account_name, -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);
 
        g_free (account_name);
 }
 
-void
-bold_if_default_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
-                           GtkTreeModel *tree_model,  GtkTreeIter *iter,  gpointer user_data)
+static void
+on_account_updated (ModestAccountMgr* mgr,
+                    gchar* account_name,
+                    gpointer user_data)
+{
+       update_account_view (mgr, MODEST_ACCOUNT_VIEW (user_data));
+}
+
+static void
+bold_if_default_account_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
+                                   GtkTreeModel *tree_model,  GtkTreeIter *iter,  gpointer user_data)
 {
        gboolean is_default;
+       GtkStyle *style;
+       const gchar *font_style;
+       PangoAttribute *attr;
+       PangoAttrList *attr_list = NULL;
+       GtkWidget *widget;
+
+       gtk_tree_model_get (tree_model, iter,
+                           MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, &is_default,
+                           -1);
+
+/*     widget = gtk_tree_view_column_get_tree_view (column); */
+       widget = GTK_WIDGET (user_data);
+       font_style = is_default?"EmpSystemFont":"SystemFont";
+       style = gtk_rc_get_style_by_paths (gtk_widget_get_settings (GTK_WIDGET(widget)),
+                                          font_style, NULL,
+                                          G_TYPE_NONE);
+       if (style) {
+               attr = pango_attr_font_desc_new (pango_font_description_copy (style->font_desc));
+
+               attr_list = pango_attr_list_new ();
+               pango_attr_list_insert (attr_list, attr);
+
+               g_object_set (G_OBJECT(renderer),
+                             "attributes", attr_list, 
+                             NULL);
+
+               pango_attr_list_unref (attr_list);
+       } else {
+               g_object_set (G_OBJECT(renderer),
+                             "weight", is_default ? 800: 400,
+                             NULL);
+       }
+}
+
+static void
+bold_if_default_last_updated_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
+                                        GtkTreeModel *tree_model,  GtkTreeIter *iter,  gpointer user_data)
+{
+       gboolean is_default;
+       GtkStyle *style;
+       const gchar *font_style;
+       PangoAttribute *attr;
+       PangoAttrList *attr_list = NULL;
+       GtkWidget *widget;
+
        gtk_tree_model_get (tree_model, iter, MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN,
                            &is_default, -1);
-       g_object_set (G_OBJECT(renderer),
-                     "weight", is_default ? 800: 400,
-                     NULL);
+
+/*     widget = gtk_tree_view_column_get_tree_view (column); */
+       widget = GTK_WIDGET (user_data);
+       font_style = is_default?"EmpSmallSystemFont":"SmallSystemFont";
+       style = gtk_rc_get_style_by_paths (gtk_widget_get_settings (GTK_WIDGET(widget)),
+                                          font_style, NULL,
+                                          G_TYPE_NONE);
+       if (style) {
+               attr = pango_attr_font_desc_new (pango_font_description_copy (style->font_desc));
+
+               attr_list = pango_attr_list_new ();
+               pango_attr_list_insert (attr_list, attr);
+
+               g_object_set (G_OBJECT(renderer),
+                             "attributes", attr_list, 
+                             NULL);
+
+               pango_attr_list_unref (attr_list);
+       } else {
+               g_object_set (G_OBJECT(renderer),
+                             "weight", is_default ? 800: 400,
+                             NULL);
+       }
 }
 
 static void
@@ -340,36 +584,41 @@ init_view (ModestAccountView *self)
 {
        ModestAccountViewPrivate *priv;
        GtkCellRenderer *toggle_renderer, *text_renderer;
-       GtkListStore *model;
        GtkTreeViewColumn *column;
        
+       g_return_if_fail (MODEST_IS_ACCOUNT_VIEW (self));
        priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
                
-       model = gtk_list_store_new (6,
-                                   G_TYPE_STRING,  /* account name */
-                                   G_TYPE_STRING,  /* account display name */
-                                   G_TYPE_BOOLEAN, /* is-enabled */
-                                   G_TYPE_BOOLEAN, /* is-default */
-                                   G_TYPE_STRING,  /* account proto (pop, imap,...) */
-                                   G_TYPE_STRING   /* last updated (time_t) */
-               ); 
+       priv->model = GTK_TREE_MODEL (gtk_list_store_new (8,
+                                                         G_TYPE_STRING,  /* account name */
+                                                         G_TYPE_STRING,  /* account display name */
+                                                         G_TYPE_BOOLEAN, /* is-enabled */
+                                                         G_TYPE_BOOLEAN, /* is-default */
+                                                         G_TYPE_STRING,  /* account proto (pop, imap,...) */
+                                                         G_TYPE_STRING,   /* last updated (time_t) */
+                                                         G_TYPE_BOOLEAN, /* has_new_mails has_color */
+                                                         G_TYPE_POINTER /* has_new_mails color */
+                                             )); 
                
        gtk_tree_sortable_set_sort_column_id (
-               GTK_TREE_SORTABLE (model), MODEST_ACCOUNT_VIEW_DISPLAY_NAME_COLUMN, 
+               GTK_TREE_SORTABLE (priv->model), MODEST_ACCOUNT_VIEW_DISPLAY_NAME_COLUMN, 
                GTK_SORT_ASCENDING);
 
-       gtk_tree_view_set_model (GTK_TREE_VIEW(self), GTK_TREE_MODEL(model));
-       g_object_unref (G_OBJECT (model));
+       priv->filter = gtk_tree_model_filter_new (priv->model, NULL);
 
-       toggle_renderer = gtk_cell_renderer_toggle_new ();
-       text_renderer = gtk_cell_renderer_text_new ();
+       gtk_tree_view_set_model (GTK_TREE_VIEW(self), GTK_TREE_MODEL(priv->filter));
+       g_object_unref (G_OBJECT (priv->model));
+       g_object_unref (G_OBJECT (priv->filter));
 
+       toggle_renderer = gtk_cell_renderer_toggle_new ();
        /* 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);
+       gtk_tree_view_column_set_visible (column, FALSE);
                                        
        /* Disable the Maemo GtkTreeView::allow-checkbox-mode Maemo modification, 
         * which causes the model column to be updated automatically when the row is clicked.
@@ -378,40 +627,90 @@ init_view (ModestAccountView *self)
         *
         * djcb: indeed, they have been removed for post-bora, i added the ifdefs...
                 */
-#ifdef MODEST_HILDON_VERSION_0 
-       g_object_set(G_OBJECT(self), "allow-checkbox-mode", FALSE, NULL);
-       g_object_set(G_OBJECT(toggle_renderer), "checkbox-mode", FALSE, NULL);
-#endif /*MODEST_HILDON_VERSION_0 */
-       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_cell_data_func(column, text_renderer, bold_if_default_cell_data,
-                                               NULL, NULL);
+       priv->account_name_renderer = gtk_cell_renderer_text_new ();
+       g_object_set (G_OBJECT (priv->account_name_renderer), 
+                     "ellipsize", PANGO_ELLIPSIZE_END, "ellipsize-set", TRUE, 
+                     "xpad", MODEST_MARGIN_DOUBLE,
+                     NULL);
+
+       priv->account_name_column =  gtk_tree_view_column_new_with_attributes (_("mcen_ti_account"), priv->account_name_renderer,
+                                                                              "text", MODEST_ACCOUNT_VIEW_DISPLAY_NAME_COLUMN,
+                                                                              NULL);
+       gtk_tree_view_append_column (GTK_TREE_VIEW(self), priv->account_name_column);
+       gtk_tree_view_column_set_expand (priv->account_name_column, TRUE);
+       gtk_tree_view_column_set_cell_data_func(priv->account_name_column, priv->account_name_renderer, 
+                                               bold_if_default_account_cell_data,
+                                               self, 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,
+                     "xpad", MODEST_MARGIN_DOUBLE,
+                     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_cell_data_func(column, text_renderer, bold_if_default_cell_data,
-                                               NULL, NULL);
-                       
+       gtk_tree_view_column_set_expand (column, FALSE);
+       gtk_tree_view_column_set_cell_data_func(column, text_renderer, bold_if_default_last_updated_cell_data,
+                                               self, NULL);
+
        /* Show the column headers,
         * which does not seem to be the default on Maemo.
-        */                     
-       gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self), TRUE);
+        */
 
-       priv->sig1 = g_signal_connect (G_OBJECT(priv->account_mgr),"account_removed",
-                                      G_CALLBACK(on_account_removed), self);
-       priv->sig2 = g_signal_connect (G_OBJECT(priv->account_mgr), "account_changed",
-                                      G_CALLBACK(on_account_changed), self);
+       update_display_mode (self);
+
+       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);
 }
 
 
-
 ModestAccountView*
 modest_account_view_new (ModestAccountMgr *account_mgr)
 {
@@ -420,7 +719,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));
@@ -429,6 +732,10 @@ modest_account_view_new (ModestAccountMgr *account_mgr)
        init_view (MODEST_ACCOUNT_VIEW (obj));
        update_account_view (account_mgr, MODEST_ACCOUNT_VIEW (obj));
        
+       /* Hide headers by default */
+       gtk_tree_view_set_headers_visible ((GtkTreeView *)obj, FALSE);
+       gtk_tree_view_set_rules_hint ((GtkTreeView *) obj, TRUE);
+
        return MODEST_ACCOUNT_VIEW (obj);
 }
 
@@ -452,17 +759,252 @@ 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 
+{
+               ModestAccountView* self;
+               const gchar *account_name;
+} ForEachData;
+
+static void 
+modest_account_view_select_account (ModestAccountView *account_view, 
+                                   const gchar* account_name)
+{      
+       return;
+}
+
+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));
+}
+
+static void 
+on_notify_style (GObject *obj, GParamSpec *spec, gpointer userdata)
+{
+       if (strcmp ("style", spec->name) == 0) {
+               update_style (MODEST_ACCOUNT_VIEW (obj));
+               gtk_widget_queue_draw (GTK_WIDGET (obj));
+       } 
+}
+
+static void
+update_display_mode (ModestAccountView *self)
+{
+       ModestAccountViewPrivate *priv;
+       GtkTreeViewColumn *column;
+       GList *renderers;
+       GtkCellRenderer *renderer;
+       
+       g_return_if_fail (MODEST_IS_ACCOUNT_VIEW (self));
+       priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
+
+       /* Last updated column */
+       column = gtk_tree_view_get_column (GTK_TREE_VIEW (self), 2);
+       gtk_tree_view_column_set_visible (column, !priv->picker_mode);
+
+       /* Name column */
+       column = gtk_tree_view_get_column (GTK_TREE_VIEW (self), 1);
+       renderers = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (column));
+       renderer = (GtkCellRenderer *) renderers->data;
+       g_object_set (renderer, 
+                     "align-set", TRUE,
+                     "alignment", priv->picker_mode?PANGO_ALIGN_CENTER:PANGO_ALIGN_LEFT,
+                     NULL);
+       g_list_free (renderers);
+}
 
-void modest_account_view_block_conf_updates (ModestAccountView *account_view)
+void 
+modest_account_view_set_picker_mode (ModestAccountView *self, gboolean enable)
 {
-       ModestAccountViewPrivate* priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(account_view);
-       priv->block_conf_updates = TRUE;
+       ModestAccountViewPrivate *priv;
+       
+       g_return_if_fail (MODEST_IS_ACCOUNT_VIEW (self));
+       priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
+
+       priv->picker_mode = enable;
+       update_display_mode (self);
 }
 
-void modest_account_view_unblock_conf_updates (ModestAccountView *account_view)
+gboolean 
+modest_account_view_get_picker_mode (ModestAccountView *self)
 {
-       ModestAccountViewPrivate* priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(account_view);
-       priv->block_conf_updates = FALSE;
+       ModestAccountViewPrivate *priv;
        
-       update_account_view (modest_runtime_get_account_mgr(), account_view);
+       g_return_val_if_fail (MODEST_IS_ACCOUNT_VIEW (self), FALSE);
+       priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
+
+       return priv->picker_mode;
+}
+
+void
+modest_account_view_set_show_last_update (ModestAccountView *self, 
+                                         gboolean show)
+{
+       ModestAccountViewPrivate *priv;
+       
+       g_return_if_fail (MODEST_IS_ACCOUNT_VIEW (self));
+       priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
+
+       priv->show_last_updated = show;
+       update_account_view (priv->account_mgr, self);
+}
+
+gboolean 
+modest_account_view_get_show_last_updated (ModestAccountView *self)
+{
+       ModestAccountViewPrivate *priv;
+       
+       g_return_val_if_fail (MODEST_IS_ACCOUNT_VIEW (self), FALSE);
+       priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
+
+       return priv->show_last_updated;
+}
+
+GtkTreeModel *
+modest_account_view_get_model (ModestAccountView *self)
+{
+       ModestAccountViewPrivate *priv;
+
+       priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE (self);
+
+       return priv->model;
+}
+
+GtkTreeModel *
+modest_account_view_get_filter (ModestAccountView *self)
+{
+       ModestAccountViewPrivate *priv;
+
+       priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE (self);
+
+       return priv->filter;
 }
+
+#ifdef MODEST_TOOLKIT_HILDON2
+static gboolean
+live_search_visible_func (GtkTreeModel *model,
+                         GtkTreeIter  *iter,
+                         gchar        *text,
+                         gpointer      data)
+{
+       gchar *display_name;
+       gboolean result;
+       gtk_tree_model_get(model, iter, 
+                          MODEST_ACCOUNT_VIEW_DISPLAY_NAME_COLUMN,
+                          &display_name, -1);
+
+       result = modest_text_utils_live_search_find (display_name, text);
+
+       g_free (display_name);
+
+       return result;
+}
+
+GtkWidget *
+modest_account_view_setup_live_search (ModestAccountView *self)
+{
+       GtkWidget *live_search;
+       live_search = hildon_live_search_new ();
+       hildon_live_search_set_filter (HILDON_LIVE_SEARCH (live_search),
+                                      GTK_TREE_MODEL_FILTER (modest_account_view_get_filter (MODEST_ACCOUNT_VIEW (self))));
+       hildon_live_search_set_visible_func (HILDON_LIVE_SEARCH (live_search), live_search_visible_func, self, NULL);
+       hildon_live_search_set_text_column (HILDON_LIVE_SEARCH (live_search),
+                                           MODEST_ACCOUNT_VIEW_DISPLAY_NAME_COLUMN);
+
+       return live_search;
+}
+#endif
+
+static void
+update_style (ModestAccountView *self)
+{
+       ModestAccountViewPrivate *priv;
+       GdkColor style_active_color;
+
+       g_return_if_fail (MODEST_IS_ACCOUNT_VIEW (self));
+       priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE (self);
+
+       if (gtk_style_lookup_color (GTK_WIDGET (self)->style, "ActiveTextColor", &style_active_color)) {
+               g_object_set (G_OBJECT (priv->account_name_renderer),
+                             "foreground-gdk", &style_active_color,
+                             NULL);
+               gtk_tree_view_column_set_attributes (priv->account_name_column, priv->account_name_renderer,
+                                                    "text", MODEST_ACCOUNT_VIEW_DISPLAY_NAME_COLUMN,
+                                                    "foreground-set", MODEST_ACCOUNT_VIEW_HAS_NEW_MAILS_COLUMN,
+                                                    NULL);
+       } else {
+               g_object_set (G_OBJECT (priv->account_name_renderer),
+                             "foreground-set", FALSE,
+                             "foreground-gdk", NULL,
+                             NULL);
+               gtk_tree_view_column_set_attributes (priv->account_name_column, priv->account_name_renderer,
+                                                    "text", MODEST_ACCOUNT_VIEW_DISPLAY_NAME_COLUMN,
+                                                    NULL);
+       }
+
+       update_account_view (priv->account_mgr, self);
+}
+