Modified webpage: now tinymail repository is in gitorious.
[modest] / src / widgets / modest-account-view.c
index b40ef63..1476aa3 100644 (file)
@@ -28,6 +28,7 @@
  */
 
 #include <glib/gi18n.h>
+#include <gtk/gtk.h>
 #include "modest-account-view.h"
 
 #include <modest-account-mgr.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 */
@@ -63,12 +65,12 @@ 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);
 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,
@@ -77,6 +79,7 @@ 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;
@@ -86,9 +89,19 @@ struct _ModestAccountViewPrivate {
        ModestAccountMgr *account_mgr;
 
        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, \
@@ -150,8 +163,11 @@ modest_account_view_init (ModestAccountView *obj)
        priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(obj);
        
        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
@@ -171,6 +187,11 @@ modest_account_view_finalize (GObject *obj)
 
        priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(obj);
 
+       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;
@@ -203,6 +224,7 @@ get_last_updated_string(ModestAccountView *self, ModestAccountMgr* account_mgr,
        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)) {
@@ -216,25 +238,29 @@ get_last_updated_string(ModestAccountView *self, ModestAccountMgr* account_mgr,
        } 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)));
-       
+
+       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 (model);
+       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
@@ -268,25 +294,28 @@ update_account_view (ModestAccountMgr *account_mgr, ModestAccountView *view)
 
                        /* 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 (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 (_("mcen_ti_lastupdated"), "\n", 
-                                                                  last_updated_string,
-                                                                  NULL);
-#endif
+                               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,
+                                       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),
@@ -295,15 +324,10 @@ update_account_view (ModestAccountMgr *account_mgr, ModestAccountView *view)
                                        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
+                                       MODEST_ACCOUNT_VIEW_HAS_NEW_MAILS_COLUMN, has_new_mails,
                                        -1);
-#ifdef MODEST_TOOLKIT_HILDON2
                                g_free (last_updated_hildon2);
-#endif
                        }
                }
                
@@ -319,27 +343,42 @@ 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);
        }
+
+       priv->update_account_view_idle_id = 0;
+       return FALSE;
 }
 
 static void
+update_account_view (ModestAccountMgr *account_mgr, ModestAccountView *view)
+{
+       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);
+       }
+}
+
+
+static void
 on_account_busy_changed(ModestAccountMgr *account_mgr, 
                         const gchar *account_name,
                         gboolean busy, 
                         ModestAccountView *self)
 {
-       GtkListStore *model = GTK_LIST_STORE(gtk_tree_view_get_model (GTK_TREE_VIEW(self)));
        GtkTreeIter iter;
        gboolean found = FALSE;
+       ModestAccountViewPrivate *priv;
+
+       priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
 
-       if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(model), &iter))
+       if (!gtk_tree_model_get_iter_first(GTK_TREE_MODEL(priv->model), &iter))
                return;
 
        do {
                gchar* cur_name;
-               gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, 
+               gtk_tree_model_get(GTK_TREE_MODEL(priv->model), &iter, 
                                   MODEST_ACCOUNT_VIEW_NAME_COLUMN, 
                                   &cur_name, -1);
 
@@ -351,30 +390,22 @@ on_account_busy_changed(ModestAccountMgr *account_mgr,
                                return;
                        }
                        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 (_("mcen_ti_lastupdated"), "\n", 
                                                            last_updated_string,
                                                            NULL);
-#endif
-                       gtk_list_store_set(model, &iter, 
-#ifdef MODEST_TOOLKIT_HILDON2
+                       gtk_list_store_set(GTK_LIST_STORE (priv->model), &iter, 
                                           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_object_unref (settings);
                        found = TRUE;
                }
                g_free (cur_name);
 
-       } while (!found && gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &iter));
+       } while (!found && gtk_tree_model_iter_next(priv->model, &iter));
 }
 
 static void
@@ -415,8 +446,6 @@ on_account_removed (TnyAccountStore *account_store,
        
        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);
        }
@@ -431,7 +460,6 @@ on_account_default_toggled (GtkCellRendererToggle *cell_renderer,
                            ModestAccountView *self)
 {
        ModestAccountViewPrivate *priv;
-       GtkTreeModel *model;
        GtkTreeIter iter;
        gchar *account_name = NULL;
 
@@ -443,10 +471,13 @@ on_account_default_toggled (GtkCellRendererToggle *cell_renderer,
                return;
 
        priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(self);
-       model = gtk_tree_view_get_model (GTK_TREE_VIEW(self));  
-       gtk_tree_model_get_iter_from_string (model, &iter, path);
+
+       if (!gtk_tree_model_get_iter_from_string (priv->filter, &iter, path)) {
+               g_warning ("Got path of a not existing iter");
+               return;
+       }
        
-       gtk_tree_model_get (model, &iter, 
+       gtk_tree_model_get (priv->filter, &iter, 
                            MODEST_ACCOUNT_VIEW_NAME_COLUMN, 
                            &account_name, -1);
 
@@ -476,37 +507,38 @@ bold_if_default_account_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer
                                    GtkTreeModel *tree_model,  GtkTreeIter *iter,  gpointer user_data)
 {
        gboolean is_default;
-#ifdef MODEST_TOOLKIT_HILDON2
        GtkStyle *style;
        const gchar *font_style;
        PangoAttribute *attr;
        PangoAttrList *attr_list = NULL;
        GtkWidget *widget;
-#endif
-       gtk_tree_model_get (tree_model, iter, MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN,
-                           &is_default, -1);
 
-#ifdef MODEST_TOOLKIT_HILDON2
-       widget = gtk_tree_view_column_get_tree_view (column);
+       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);
-       attr = pango_attr_font_desc_new (pango_font_description_copy (style->font_desc));
+       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);
+               attr_list = pango_attr_list_new ();
+               pango_attr_list_insert (attr_list, attr);
 
-       g_object_set (G_OBJECT(renderer),
-                     "attributes", attr_list, 
-                     NULL);
+               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);
-#endif
+               pango_attr_list_unref (attr_list);
+       } else {
+               g_object_set (G_OBJECT(renderer),
+                             "weight", is_default ? 800: 400,
+                             NULL);
+       }
 }
 
 static void
@@ -514,37 +546,37 @@ bold_if_default_last_updated_cell_data  (GtkTreeViewColumn *column,  GtkCellRend
                                         GtkTreeModel *tree_model,  GtkTreeIter *iter,  gpointer user_data)
 {
        gboolean is_default;
-#ifdef MODEST_TOOLKIT_HILDON2
        GtkStyle *style;
        const gchar *font_style;
        PangoAttribute *attr;
        PangoAttrList *attr_list = NULL;
        GtkWidget *widget;
-#endif
+
        gtk_tree_model_get (tree_model, iter, MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN,
                            &is_default, -1);
 
-#ifdef MODEST_TOOLKIT_HILDON2
-       widget = gtk_tree_view_column_get_tree_view (column);
+/*     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);
-       attr = pango_attr_font_desc_new (pango_font_description_copy (style->font_desc));
+       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);
+               attr_list = pango_attr_list_new ();
+               pango_attr_list_insert (attr_list, attr);
 
-       g_object_set (G_OBJECT(renderer),
-                     "attributes", attr_list, 
-                     NULL);
+               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);
-#endif
+               pango_attr_list_unref (attr_list);
+       } else {
+               g_object_set (G_OBJECT(renderer),
+                             "weight", is_default ? 800: 400,
+                             NULL);
+       }
 }
 
 static void
@@ -552,27 +584,31 @@ 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);
+
+       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 */
@@ -582,9 +618,7 @@ init_view (ModestAccountView *self)
                 "active", MODEST_ACCOUNT_VIEW_IS_DEFAULT_COLUMN, NULL);
        gtk_tree_view_append_column (GTK_TREE_VIEW(self),
                                     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.
@@ -593,10 +627,6 @@ init_view (ModestAccountView *self)
         *
         * djcb: indeed, they have been removed for post-bora, i added the ifdefs...
                 */
-#ifdef MODEST_HAVE_HILDON0_WIDGETS
-       g_object_set(G_OBJECT(self), "allow-checkbox-mode", FALSE, NULL);
-       g_object_set(G_OBJECT(toggle_renderer), "checkbox-mode", FALSE, NULL);
-#endif /* MODEST_HAVE_HILDON0_WIDGETS */
 
        priv->sig_handlers = 
                modest_signal_mgr_connect (priv->sig_handlers,
@@ -606,29 +636,27 @@ init_view (ModestAccountView *self)
                                           self);
        
        /* account name */
-       text_renderer = gtk_cell_renderer_text_new ();
-       g_object_set (G_OBJECT (text_renderer), 
+       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, 
-#ifdef MODEST_TOOLKIT_HILDON2
-                     "xpad", HILDON_MARGIN_DOUBLE,
-#endif
+                     "xpad", MODEST_MARGIN_DOUBLE,
                      NULL);
 
-       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_account_cell_data,
-                                               NULL, 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 */
        text_renderer = gtk_cell_renderer_text_new ();
        g_object_set (G_OBJECT (text_renderer), 
                      "alignment", PANGO_ALIGN_RIGHT, 
                      "xalign", 1.0,
-#ifdef MODEST_TOOLKIT_HILDON2
-                     "xpad", HILDON_MARGIN_DOUBLE,
-#endif
+                     "xpad", MODEST_MARGIN_DOUBLE,
                      NULL);
 
        column =  gtk_tree_view_column_new_with_attributes (_("mcen_ti_lastupdated"), text_renderer,"markup",
@@ -636,14 +664,13 @@ init_view (ModestAccountView *self)
        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_last_updated_cell_data,
-                                               NULL, NULL);
-                       
+                                               self, 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);
-#endif
+
+       update_display_mode (self);
 
        priv->sig_handlers = 
                modest_signal_mgr_connect (priv->sig_handlers, 
@@ -705,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);
 }
 
@@ -755,61 +786,11 @@ typedef struct
                const gchar *account_name;
 } ForEachData;
 
-static gboolean
-on_model_foreach_select_account(GtkTreeModel *model, 
-       GtkTreePath *path, GtkTreeIter *iter, gpointer user_data)
-{
-       ForEachData *state = (ForEachData*)(user_data);
-       
-       /* Select the item if it has the matching account name: */
-       gchar *this_account_name = NULL;
-       gtk_tree_model_get (model, iter, 
-               MODEST_ACCOUNT_VIEW_NAME_COLUMN, &this_account_name, 
-               -1); 
-       if(this_account_name && state->account_name 
-               && (strcmp (this_account_name, state->account_name) == 0)) {
-               
-               GtkTreeSelection *selection = 
-                       gtk_tree_view_get_selection (GTK_TREE_VIEW (state->self));
-               gtk_tree_selection_select_iter (selection, iter);
-               
-               return TRUE; /* Stop walking the tree. */
-       }
-       
-       return FALSE; /* Keep walking the tree. */
-}
-
 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;
-       state->account_name = account_name;
-       
-       GtkTreeModel *model = gtk_tree_view_get_model (
-               GTK_TREE_VIEW (account_view));
-       gtk_tree_model_foreach (model, 
-               on_model_foreach_select_account, state);
-               
-       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
@@ -864,7 +845,166 @@ 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_set_picker_mode (ModestAccountView *self, gboolean enable)
+{
+       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);
+}
+
+gboolean 
+modest_account_view_get_picker_mode (ModestAccountView *self)
+{
+       ModestAccountViewPrivate *priv;
+       
+       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);
+}
+