* Some initializations
[modest] / src / widgets / modest-folder-view.c
index b560094..3a36c89 100644 (file)
 #include <glib/gi18n.h>
 #include <string.h>
 
-#include <tny-account-tree-model.h>
-#include <tny-account-store-iface.h>
-#include <tny-account-iface.h>
-#include <tny-msg-folder-iface.h>
-#include <tny-summary-window-iface.h>
+#include <tny-gtk-account-list-model.h>
+#include <tny-gtk-folder-store-tree-model.h>
+#include <tny-gtk-header-list-model.h>
+#include <tny-account-store.h>
+#include <tny-account.h>
+#include <tny-folder.h>
+#include <modest-tny-folder.h>
+#include <modest-marshal.h>
 #include <modest-icon-names.h>
-#include "modest-icon-factory.h"
+#include <modest-icon-factory.h>
+#include <modest-tny-account-store.h>
+#include <modest-text-utils.h>
 
 #include "modest-folder-view.h"
 
-
 /* 'private'/'protected' functions */
 static void modest_folder_view_class_init  (ModestFolderViewClass *klass);
 static void modest_folder_view_init        (ModestFolderView *obj);
 static void modest_folder_view_finalize    (GObject *obj);
 
-static gboolean update_model (ModestFolderView *self,TnyAccountStoreIface *iface);
-static gboolean update_model_empty (ModestFolderView *self);
+static gboolean     update_model             (ModestFolderView *self,
+                                             ModestTnyAccountStore *account_store);
+static gboolean     update_model_empty       (ModestFolderView *self);
+
+static void         on_selection_changed     (GtkTreeSelection *sel, gpointer data);
+static void         on_subscription_changed  (TnyStoreAccount *store_account, TnyFolder *folder,
+                                             ModestFolderView *self);
+
+static gboolean     modest_folder_view_update_model     (ModestFolderView *self,
+                                                        TnyAccountStore *account_store);
+
+static void         modest_folder_view_disconnect_store_account_handlers (GtkTreeView *self);
+
+static gint         cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
+                             gpointer user_data);
 
-static void selection_changed (GtkTreeSelection *sel, gpointer data);
 
 enum {
-       FOLDER_SELECTED_SIGNAL,
+       FOLDER_SELECTION_CHANGED_SIGNAL,
        LAST_SIGNAL
 };
 
 typedef struct _ModestFolderViewPrivate ModestFolderViewPrivate;
 struct _ModestFolderViewPrivate {
 
-       TnyAccountStoreIface *tny_account_store;
-       TnyMsgFolderIface *cur_folder;
-       gboolean view_is_empty;
+       TnyAccountStore     *account_store;
+       TnyFolder           *cur_folder;
+
+       gulong               sig1, sig2;
+       gulong              *store_accounts_handlers;
+       GMutex              *lock;
+       GtkTreeSelection    *cur_selection;
+       TnyFolderStoreQuery *query;
 
-       GMutex *lock;
 };
 #define MODEST_FOLDER_VIEW_GET_PRIVATE(o)                              \
        (G_TYPE_INSTANCE_GET_PRIVATE((o),                               \
@@ -89,6 +109,7 @@ modest_folder_view_get_type (void)
                        sizeof(ModestFolderView),
                        1,              /* n_preallocs */
                        (GInstanceInitFunc) modest_folder_view_init,
+                       NULL
                };
                                
                my_type = g_type_register_static (GTK_TYPE_TREE_VIEW,
@@ -112,34 +133,40 @@ modest_folder_view_class_init (ModestFolderViewClass *klass)
        g_type_class_add_private (gobject_class,
                                  sizeof(ModestFolderViewPrivate));
        
-       signals[FOLDER_SELECTED_SIGNAL] = 
-               g_signal_new ("folder_selected",
+       signals[FOLDER_SELECTION_CHANGED_SIGNAL] = 
+               g_signal_new ("folder_selection_changed",
                              G_TYPE_FROM_CLASS (gobject_class),
                              G_SIGNAL_RUN_FIRST,
                              G_STRUCT_OFFSET (ModestFolderViewClass,
-                                              folder_selected),
+                                              folder_selection_changed),
                              NULL, NULL,
-                             g_cclosure_marshal_VOID__POINTER,
-                             G_TYPE_NONE, 1, G_TYPE_POINTER); 
+                             modest_marshal_VOID__POINTER_BOOLEAN,
+                             G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_BOOLEAN);
 }
 
 
-
 static void
 text_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
-                  GtkTreeModel *tree_model,  GtkTreeIter *iter,  gpointer data)
+                GtkTreeModel *tree_model,  GtkTreeIter *iter,  gpointer data)
 {
        GObject *rendobj;
        gchar *fname;
        gint unread;
-       TnyMsgFolderType type;
+       TnyFolderType type;
        
+       g_return_if_fail (column);
+       g_return_if_fail (tree_model);
+
        gtk_tree_model_get (tree_model, iter,
-                           TNY_ACCOUNT_TREE_MODEL_NAME_COLUMN, &fname,
-                           TNY_ACCOUNT_TREE_MODEL_TYPE_COLUMN, &type,
-                           TNY_ACCOUNT_TREE_MODEL_UNREAD_COLUMN, &unread, -1);
+                           TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &fname,
+                           TNY_GTK_FOLDER_STORE_TREE_MODEL_UNREAD_COLUMN, &unread,
+                           TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
+                           -1);
        rendobj = G_OBJECT(renderer);
 
+       if (!fname)
+               return;
+
        if (unread > 0) {
                gchar *folder_title = g_strdup_printf ("%s (%d)", fname, unread);
                g_object_set (rendobj,"text", folder_title,  "weight", 800, NULL);
@@ -150,59 +177,6 @@ text_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
        g_free (fname);
 }
 
-/* FIXME: move these to TnyMail */
-enum {
-
-       TNY_MSG_FOLDER_TYPE_NOTES = TNY_MSG_FOLDER_TYPE_SENT + 1, /* urgh */
-       TNY_MSG_FOLDER_TYPE_DRAFTS,
-       TNY_MSG_FOLDER_TYPE_CONTACTS,
-       TNY_MSG_FOLDER_TYPE_CALENDAR
-};
-       
-static TnyMsgFolderType
-guess_folder_type (const gchar* name)
-{
-       TnyMsgFolderType type;
-       gchar *folder;
-
-       g_return_val_if_fail (name, TNY_MSG_FOLDER_TYPE_NORMAL);
-       
-       type = TNY_MSG_FOLDER_TYPE_NORMAL;
-       folder = g_utf8_strdown (name, strlen(name));
-
-       if (strcmp (folder, "inbox") == 0 ||
-           strcmp (folder, _("inbox")) == 0)
-               type = TNY_MSG_FOLDER_TYPE_INBOX;
-       else if (strcmp (folder, "outbox") == 0 ||
-                strcmp (folder, _("outbox")) == 0)
-               type = TNY_MSG_FOLDER_TYPE_OUTBOX;
-       else if (g_str_has_prefix(folder, "junk") ||
-                g_str_has_prefix(folder, _("junk")))
-               type = TNY_MSG_FOLDER_TYPE_JUNK;
-       else if (g_str_has_prefix(folder, "trash") ||
-                g_str_has_prefix(folder, _("trash")))
-               type = TNY_MSG_FOLDER_TYPE_JUNK;
-       else if (g_str_has_prefix(folder, "sent") ||
-                g_str_has_prefix(folder, _("sent")))
-               type = TNY_MSG_FOLDER_TYPE_SENT;
-
-       /* these are not *really* TNY_ types */
-       else if (g_str_has_prefix(folder, "draft") ||
-                g_str_has_prefix(folder, _("draft")))
-               type = TNY_MSG_FOLDER_TYPE_DRAFTS;
-       else if (g_str_has_prefix(folder, "notes") ||
-                g_str_has_prefix(folder, _("notes")))
-               type = TNY_MSG_FOLDER_TYPE_NOTES;
-       else if (g_str_has_prefix(folder, "contacts") ||
-                g_str_has_prefix(folder, _("contacts")))
-               type = TNY_MSG_FOLDER_TYPE_CONTACTS;
-       else if (g_str_has_prefix(folder, "calendar") ||
-                g_str_has_prefix(folder, _("calendar")))
-               type = TNY_MSG_FOLDER_TYPE_CALENDAR;
-       
-       g_free (folder);
-       return type;
-}
 
 
 static void
@@ -211,49 +185,50 @@ icon_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
 {
        GObject *rendobj;
        GdkPixbuf *pixbuf;
-       TnyMsgFolderType type;
+       TnyFolderType type;
        gchar *fname = NULL;
        gint unread;
        
        rendobj = G_OBJECT(renderer);
        gtk_tree_model_get (tree_model, iter,
-                           TNY_ACCOUNT_TREE_MODEL_TYPE_COLUMN, &type,
-                           TNY_ACCOUNT_TREE_MODEL_NAME_COLUMN, &fname,
-                           TNY_ACCOUNT_TREE_MODEL_UNREAD_COLUMN, &unread, -1);
+                           TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
+                           TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &fname,
+                           TNY_GTK_FOLDER_STORE_TREE_MODEL_UNREAD_COLUMN, &unread, -1);
        rendobj = G_OBJECT(renderer);
        
-       if (type == TNY_MSG_FOLDER_TYPE_NORMAL)
-               type = guess_folder_type (fname);
-       
-       if (fname);
-               g_free (fname);
+       if (type == TNY_FOLDER_TYPE_NORMAL || type == TNY_FOLDER_TYPE_UNKNOWN)
+               type = modest_tny_folder_guess_folder_type_from_name (fname);
+       g_free (fname);
 
        switch (type) {
-        case TNY_MSG_FOLDER_TYPE_INBOX:
+       case TNY_FOLDER_TYPE_ROOT:
+               pixbuf = modest_icon_factory_get_icon (MODEST_FOLDER_ICON_ACCOUNT);
+                break;
+       case TNY_FOLDER_TYPE_INBOX:
                 pixbuf = modest_icon_factory_get_icon (MODEST_FOLDER_ICON_INBOX);
                 break;
-        case TNY_MSG_FOLDER_TYPE_OUTBOX:
+        case TNY_FOLDER_TYPE_OUTBOX:
                 pixbuf = modest_icon_factory_get_icon (MODEST_FOLDER_ICON_OUTBOX);
                 break;
-        case TNY_MSG_FOLDER_TYPE_JUNK:
+        case TNY_FOLDER_TYPE_JUNK:
                 pixbuf = modest_icon_factory_get_icon (MODEST_FOLDER_ICON_JUNK);
                 break;
-        case TNY_MSG_FOLDER_TYPE_SENT:
+        case TNY_FOLDER_TYPE_SENT:
                 pixbuf = modest_icon_factory_get_icon (MODEST_FOLDER_ICON_SENT);
                 break;
-       case TNY_MSG_FOLDER_TYPE_DRAFTS:
+       case TNY_FOLDER_TYPE_DRAFTS:
                pixbuf = modest_icon_factory_get_icon (MODEST_FOLDER_ICON_DRAFTS);
                 break;
-       case TNY_MSG_FOLDER_TYPE_NOTES:
+       case TNY_FOLDER_TYPE_NOTES:
                pixbuf = modest_icon_factory_get_icon (MODEST_FOLDER_ICON_NOTES);
                 break;
-       case TNY_MSG_FOLDER_TYPE_CALENDAR:
+       case TNY_FOLDER_TYPE_CALENDAR:
                pixbuf = modest_icon_factory_get_icon (MODEST_FOLDER_ICON_CALENDAR);
                 break;
-       case TNY_MSG_FOLDER_TYPE_CONTACTS:
+       case TNY_FOLDER_TYPE_CONTACTS:
                 pixbuf = modest_icon_factory_get_icon (MODEST_FOLDER_ICON_CONTACTS);
                 break;
-       case TNY_MSG_FOLDER_TYPE_NORMAL:
+       case TNY_FOLDER_TYPE_NORMAL:
         default:
                 pixbuf = modest_icon_factory_get_icon (MODEST_FOLDER_ICON_NORMAL);
                 break;
@@ -278,18 +253,13 @@ modest_folder_view_init (ModestFolderView *obj)
        
        priv =  MODEST_FOLDER_VIEW_GET_PRIVATE(obj);
        
-       priv->view_is_empty     = TRUE;
-       priv->tny_account_store = NULL;
-       priv->cur_folder = NULL;
-
-       priv->lock = g_mutex_new ();
-       
-       column = gtk_tree_view_column_new ();
-       gtk_tree_view_column_set_title (column,
-                                       _("All Mail Folders"));
+       priv->account_store  = NULL;
+       priv->cur_folder     = NULL;
+       priv->query          = NULL;
+       priv->lock           = g_mutex_new ();
        
-       gtk_tree_view_append_column (GTK_TREE_VIEW(obj),
-                                    column);
+       column = gtk_tree_view_column_new ();   
+       gtk_tree_view_append_column (GTK_TREE_VIEW(obj),column);
        
        renderer = gtk_cell_renderer_pixbuf_new();
        gtk_tree_view_column_pack_start (column, renderer, FALSE);
@@ -307,9 +277,36 @@ modest_folder_view_init (ModestFolderView *obj)
        gtk_tree_view_column_set_spacing (column, 2);
        gtk_tree_view_column_set_resizable (column, TRUE);
        gtk_tree_view_column_set_fixed_width (column, TRUE);            
-       gtk_tree_view_set_headers_visible   (GTK_TREE_VIEW(obj), TRUE);
        gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(obj), FALSE);
+       gtk_tree_view_set_enable_search     (GTK_TREE_VIEW(obj), FALSE);
+
+}
+
+static void
+modest_folder_view_disconnect_store_account_handlers (GtkTreeView *self)
+{
+       TnyIterator *iter;
+       ModestFolderViewPrivate *priv;
+       GtkTreeModel *model;
+       GtkTreeModelSort *sortable;
+       gint i = 0;
+
+       sortable = GTK_TREE_MODEL_SORT (gtk_tree_view_get_model (self));
+       if (!sortable)
+               return; 
+
+       model = gtk_tree_model_sort_get_model (sortable);
+       if (!model)
+               return; 
 
+       priv =  MODEST_FOLDER_VIEW_GET_PRIVATE (self);  
+       iter = tny_list_create_iterator (TNY_LIST (model));
+       while (!tny_iterator_is_done (iter)) {
+               g_signal_handler_disconnect (G_OBJECT (tny_iterator_get_current (iter)),
+                                            priv->store_accounts_handlers [i++]);
+               tny_iterator_next (iter);
+       }
+       g_object_unref (G_OBJECT (iter));
 }
 
 
@@ -317,169 +314,313 @@ static void
 modest_folder_view_finalize (GObject *obj)
 {
        ModestFolderViewPrivate *priv;
-
+       GtkTreeSelection    *sel;
+       
        g_return_if_fail (obj);
        
        priv =  MODEST_FOLDER_VIEW_GET_PRIVATE(obj);
-       if (priv->tny_account_store) {
-               g_object_unref (G_OBJECT(priv->tny_account_store));
-               priv->tny_account_store = NULL;
+       if (priv->account_store) {
+               g_signal_handler_disconnect (G_OBJECT(priv->account_store),
+                                            priv->sig1);
+               g_object_unref (G_OBJECT(priv->account_store));
+               priv->account_store = NULL;
        }
 
-
        if (priv->lock) {
                g_mutex_free (priv->lock);
                priv->lock = NULL;
        }
 
+       if (priv->store_accounts_handlers) {
+               modest_folder_view_disconnect_store_account_handlers (GTK_TREE_VIEW (obj));
+               g_free (priv->store_accounts_handlers);
+               priv->store_accounts_handlers = NULL;
+       }
+
+       if (priv->query) {
+               g_object_unref (G_OBJECT (priv->query));
+               priv->query = NULL;
+       }
+
+       sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(obj));
+       if (sel)
+               g_signal_handler_disconnect (G_OBJECT(sel), priv->sig2);
+       
        G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
 
 static void
-on_accounts_update (TnyAccountStoreIface *account_store, const gchar *account,
-                   gpointer user_data)
+on_account_update (TnyAccountStore *account_store, const gchar *account,
+                  gpointer user_data)
 {
-       update_model_empty (MODEST_FOLDER_VIEW(user_data));
-       
-       if (!update_model (MODEST_FOLDER_VIEW(user_data), account_store))
+       if (!update_model (MODEST_FOLDER_VIEW(user_data), 
+                          MODEST_TNY_ACCOUNT_STORE(account_store)))
                g_printerr ("modest: failed to update model for changes in '%s'",
                            account);
 }
 
+void
+modest_folder_view_set_title (ModestFolderView *self, const gchar *title)
+{
+       GtkTreeViewColumn *col;
+       
+       g_return_if_fail (self);
+
+       col = gtk_tree_view_get_column (GTK_TREE_VIEW(self), 0);
+       if (!col) {
+               g_printerr ("modest: failed get column for title\n");
+               return;
+       }
+
+       gtk_tree_view_column_set_title (col, title);
+       gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(self),
+                                          title != NULL);
+}
 
 GtkWidget*
-modest_folder_view_new (TnyAccountStoreIface *account_store)
+modest_folder_view_new (ModestTnyAccountStore *account_store, 
+                       TnyFolderStoreQuery *query)
 {
        GObject *self;
        ModestFolderViewPrivate *priv;
        GtkTreeSelection *sel;
-
+       
+       g_return_val_if_fail (account_store, NULL);
+       
        self = G_OBJECT(g_object_new(MODEST_TYPE_FOLDER_VIEW, NULL));
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
-
-       g_return_val_if_fail (account_store, NULL);
        
-       if (!update_model (MODEST_FOLDER_VIEW(self), account_store))
-               g_printerr ("modest: failed to update model");
-
-       g_signal_connect (G_OBJECT(account_store), "update_accounts",
-                         G_CALLBACK (on_accounts_update), self);
+       priv->account_store = g_object_ref (G_OBJECT (account_store));
+       if (query)
+               priv->query = g_object_ref (G_OBJECT (query));
+       
+       if (!update_model (MODEST_FOLDER_VIEW(self),
+                          MODEST_TNY_ACCOUNT_STORE(account_store)))
+               g_printerr ("modest: failed to update model\n");
+       
+       priv->sig1 = g_signal_connect (G_OBJECT(account_store), "account_update",
+                                      G_CALLBACK (on_account_update), self);   
        
        sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
-       g_signal_connect (sel, "changed",
-                         G_CALLBACK(selection_changed), self);
-               
+       priv->sig2 = g_signal_connect (sel, "changed",
+                                      G_CALLBACK(on_selection_changed), self);
        return GTK_WIDGET(self);
 }
 
 
-
-
 static gboolean
 update_model_empty (ModestFolderView *self)
 {
-       GtkTreeIter  iter;
-       GtkTreeStore *store;
        ModestFolderViewPrivate *priv;
        
        g_return_val_if_fail (self, FALSE);
-       
-       store = gtk_tree_store_new (1, G_TYPE_STRING);
-       gtk_tree_store_append (store, &iter, NULL);
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
+
+       /* Disconnect old handlers */
+       if (priv->store_accounts_handlers) {
+               modest_folder_view_disconnect_store_account_handlers (GTK_TREE_VIEW (self));
+               g_free (priv->store_accounts_handlers);
+               priv->store_accounts_handlers = NULL;
+       }
 
-       gtk_tree_store_set (store, &iter, 0,
-                           _("(empty)"), -1);
+       g_signal_emit (G_OBJECT(self), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
+                      NULL, TRUE);
+       return TRUE;
+}
 
-       gtk_tree_view_set_model (GTK_TREE_VIEW(self),
-                                GTK_TREE_MODEL(store));
-       g_object_unref (store);
 
-       priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
-       priv->view_is_empty = TRUE;
+static void
+update_store_account_handlers (ModestFolderView *self, TnyList *account_list)
+{
+       ModestFolderViewPrivate *priv;
+       TnyIterator *iter;
+       guint len;
        
-       return TRUE;
+       priv =  MODEST_FOLDER_VIEW_GET_PRIVATE(self);
+
+       /* Listen to subscription changes */
+       len = tny_list_get_length (TNY_LIST (account_list));
+
+       g_assert (priv->store_accounts_handlers == NULL); /* don't leak */
+       priv->store_accounts_handlers = g_malloc0 (sizeof (guint) * len);
+       iter = tny_list_create_iterator (account_list);
+       
+       if (!tny_iterator_is_done (iter)) {
+               gint i = 0;
+
+               do  {
+                       
+                       priv->store_accounts_handlers [i++] =
+                               g_signal_connect (G_OBJECT (tny_iterator_get_current (iter)),
+                                                 "subscription_changed",
+                                                 G_CALLBACK (on_subscription_changed),
+                                                 self);
+                       tny_iterator_next (iter);
+               } while (!tny_iterator_is_done (iter));
+       }
+       g_object_unref (G_OBJECT (iter));       
 }
 
 
+
 static gboolean
-update_model (ModestFolderView *self, TnyAccountStoreIface *account_store)
+update_model (ModestFolderView *self, ModestTnyAccountStore *account_store)
 {
        ModestFolderViewPrivate *priv;
-       TnyListIface     *account_list;
+
+       TnyList          *account_list;
        GtkTreeModel     *model, *sortable;
-       
+
        g_return_val_if_fail (account_store, FALSE);
-       
+
+       update_model_empty (self);
+
        priv =  MODEST_FOLDER_VIEW_GET_PRIVATE(self);
+       
+       model        = tny_gtk_folder_store_tree_model_new (FALSE, NULL);
+       account_list = TNY_LIST(model);
 
-       model        = GTK_TREE_MODEL(tny_account_tree_model_new ());
-       account_list = TNY_LIST_IFACE(model);
+       tny_account_store_get_accounts (TNY_ACCOUNT_STORE(account_store),
+                                       account_list,
+                                       TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
 
-       update_model_empty (self); /* cleanup */
-       priv->view_is_empty = TRUE;
        
-       tny_account_store_iface_get_accounts (account_store, account_list,
-                                             TNY_ACCOUNT_STORE_IFACE_STORE_ACCOUNTS);
-       if (!account_list) /* no store accounts found */ 
-               return TRUE;
+       if (account_list) {
+               sortable = gtk_tree_model_sort_new_with_model (model);
+               gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
+                                                     TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, 
+                                                     GTK_SORT_ASCENDING);
+               gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sortable),
+                                                TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, 
+                                                cmp_rows, NULL, NULL);
+               gtk_tree_view_set_model (GTK_TREE_VIEW(self), sortable);
+               update_store_account_handlers (self, account_list);
+       }
        
-       sortable = gtk_tree_model_sort_new_with_model (model);
-       gtk_tree_view_set_model (GTK_TREE_VIEW(self), sortable);
-
-       priv->view_is_empty = FALSE;    
        g_object_unref (model);
-
        return TRUE;
-} 
+}
 
 
-void
-selection_changed (GtkTreeSelection *sel, gpointer user_data)
+static void
+on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
 {
        GtkTreeModel            *model;
-       TnyMsgFolderIface       *folder = NULL;
+       TnyFolder               *folder = NULL;
        GtkTreeIter             iter;
-       ModestFolderView *tree_view;
+       ModestFolderView        *tree_view;
        ModestFolderViewPrivate *priv;
+       gint                    type;
 
        g_return_if_fail (sel);
        g_return_if_fail (user_data);
-
+       
        priv = MODEST_FOLDER_VIEW_GET_PRIVATE(user_data);
-
-       /* is_empty means that there is only the 'empty' item */
-       if (priv->view_is_empty)
-               return;
+       priv->cur_selection = sel;
        
        /* folder was _un_selected if true */
        if (!gtk_tree_selection_get_selected (sel, &model, &iter)) {
-               priv->cur_folder = NULL;
-               return; 
+               priv->cur_folder = NULL; /* FIXME: need this? */
+               return; 
        }
-
+       
        tree_view = MODEST_FOLDER_VIEW (user_data);
-
        gtk_tree_model_get (model, &iter,
-                           TNY_ACCOUNT_TREE_MODEL_INSTANCE_COLUMN,
-                           &folder, -1);
+                           TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
+                           TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder,
+                           -1);
 
-       if (priv->cur_folder) 
-               tny_msg_folder_iface_expunge (priv->cur_folder);
+       if (type == TNY_FOLDER_TYPE_ROOT)
+               return;
+       
+       /* emit 2 signals: one for the unselection of the old one,
+        * and one for the selection of the new on */
+       g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
+                      priv->cur_folder, FALSE);
+       g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
+                      folder, TRUE);
+       if (priv->cur_folder)
+               tny_folder_expunge (priv->cur_folder, NULL); /* FIXME */
        priv->cur_folder = folder;
 
-       /* folder will not be defined if you click eg. on the root node */
-       if (folder)
-               g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTED_SIGNAL], 0,
-                              folder);
+}
+
+static void 
+on_subscription_changed  (TnyStoreAccount *store_account, 
+                         TnyFolder *folder,
+                         ModestFolderView *self)
+{
+       /* TODO: probably we won't need a full reload, just the store
+          account or even the parent of the folder */
+
+       ModestFolderViewPrivate *priv;
+
+       priv =  MODEST_FOLDER_VIEW_GET_PRIVATE(self);
+       update_model (self, MODEST_TNY_ACCOUNT_STORE (priv->account_store));
 }
 
 
-gboolean
-modest_folder_view_update_model(ModestFolderView *self, 
-                               TnyAccountStoreIface *iface)
+static gboolean
+modest_folder_view_update_model (ModestFolderView *self, TnyAccountStore *account_store)
 {
        g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE);
+
+       g_signal_emit (G_OBJECT(self), signals[FOLDER_SELECTION_CHANGED_SIGNAL],
+                      0, NULL, TRUE);
        
-       return update_model (self, iface);
+       return update_model (self, MODEST_TNY_ACCOUNT_STORE(account_store)); /* ugly */
+}
+
+TnyFolder *
+modest_folder_view_get_selected (ModestFolderView *self)
+{
+       ModestFolderViewPrivate *priv;
+
+       g_return_val_if_fail (self, NULL);
+       
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
+       if (priv->cur_folder)
+               g_object_ref (priv->cur_folder);
+
+       return priv->cur_folder;
+}
+
+       
+static gint
+cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2,
+         gpointer user_data)
+{
+       gint cmp;
+       gchar         *name1, *name2;
+       TnyFolderType type;
+       TnyFolder     *folder1, *folder2;
+       
+       gtk_tree_model_get (tree_model, iter1,
+                           TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &name1,
+                           TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
+                           TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder1,
+                           -1);
+       gtk_tree_model_get (tree_model, iter2,
+                           TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &name2,
+                           TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder2,
+                           -1);
+
+       /* local_folders should be the last one */
+       if (type == TNY_FOLDER_TYPE_ROOT) {
+               /* the account name is also the name of the root folder
+                * in case of local folders */
+               if (strcmp (name1, MODEST_LOCAL_FOLDERS_ACCOUNT_NAME) == 0)
+                       cmp = +1;
+               else if (strcmp (name2, MODEST_LOCAL_FOLDERS_ACCOUNT_NAME) == 0)
+                       cmp = -1;
+               else 
+                       cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE);
+       } else {
+               cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE);
+       }
+       g_free (name1);
+       g_free (name2);
+
+       return cmp;     
 }