* Added ModestWindow object
[modest] / src / widgets / modest-folder-view.c
index be893a7..e39a9da 100644 (file)
@@ -36,6 +36,7 @@
 #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>
@@ -58,7 +59,6 @@ static void         on_subscription_changed  (TnyStoreAccount *store_account, Tn
 
 static gboolean     modest_folder_view_update_model     (ModestFolderView *self,
                                                         TnyAccountStore *account_store);
-static const gchar *get_account_name_from_folder        (GtkTreeModel *model, GtkTreeIter iter);
 
 static void         modest_folder_view_disconnect_store_account_handlers (GtkTreeView *self);
 
@@ -141,7 +141,6 @@ modest_folder_view_class_init (ModestFolderViewClass *klass)
 }
 
 
-
 static void
 text_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
                 GtkTreeModel *tree_model,  GtkTreeIter *iter,  gpointer data)
@@ -168,69 +167,6 @@ text_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
 }
 
 
-/* guess the folder type based on the name, or -1 in case of error */
-static TnyFolderType
-guess_type_from_name (const gchar* name)
-{
-       gint  type;
-       gchar *folder;
-       
-       if (!name)
-               return -1;
-       
-       type = TNY_FOLDER_TYPE_NORMAL;
-       folder = g_utf8_strdown (name, strlen(name));
-
-       if (strcmp (folder, "inbox") == 0 ||
-           strcmp (folder, _("inbox")) == 0)
-               type = TNY_FOLDER_TYPE_INBOX;
-       else if (strcmp (folder, "outbox") == 0 ||
-                strcmp (folder, _("outbox")) == 0)
-               type = TNY_FOLDER_TYPE_OUTBOX;
-       else if (g_str_has_prefix(folder, "junk") ||
-                g_str_has_prefix(folder, _("junk")))
-               type = TNY_FOLDER_TYPE_JUNK;
-       else if (g_str_has_prefix(folder, "trash") ||
-                g_str_has_prefix(folder, _("trash")))
-               type = TNY_FOLDER_TYPE_JUNK;
-       else if (g_str_has_prefix(folder, "sent") ||
-                g_str_has_prefix(folder, _("sent")))
-               type = TNY_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_FOLDER_TYPE_DRAFTS;
-       else if (g_str_has_prefix(folder, "notes") ||
-                g_str_has_prefix(folder, _("notes")))
-               type = TNY_FOLDER_TYPE_NOTES;
-       else if (g_str_has_prefix(folder, "contacts") ||
-                g_str_has_prefix(folder, _("contacts")))
-               type = TNY_FOLDER_TYPE_CONTACTS;
-       else if (g_str_has_prefix(folder, "calendar") ||
-                g_str_has_prefix(folder, _("calendar")))
-               type = TNY_FOLDER_TYPE_CALENDAR;
-       
-       g_free (folder);
-       return type;
-}
-
-
-
-TnyFolderType
-modest_folder_view_guess_folder_type (TnyFolder *folder)
-{
-       TnyFolderType type;
-
-       g_return_val_if_fail (folder, -1);
-
-       type = tny_folder_get_folder_type (folder);
-       if (type == TNY_FOLDER_TYPE_NORMAL)
-               type = guess_type_from_name (tny_folder_get_name (folder));
-
-       return type;
-}
-
 
 static void
 icon_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
@@ -249,11 +185,9 @@ icon_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *renderer,
                            TNY_GTK_FOLDER_STORE_TREE_MODEL_UNREAD_COLUMN, &unread, -1);
        rendobj = G_OBJECT(renderer);
        
-       if (type == TNY_FOLDER_TYPE_NORMAL)
-               type = guess_type_from_name (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_FOLDER_TYPE_ROOT:
@@ -463,26 +397,11 @@ modest_folder_view_new (ModestTnyAccountStore *account_store,
        sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
        priv->sig2 = g_signal_connect (sel, "changed",
                                       G_CALLBACK(on_selection_changed), self);
-                                       
+
        return GTK_WIDGET(self);
 }
 
 
-const gchar *
-modest_folder_view_get_selected_account (ModestFolderView *self)
-{
-       GtkTreeModel *model;
-       GtkTreeIter iter;
-       ModestFolderViewPrivate *priv;
-       
-       g_return_val_if_fail (self, NULL);
-       priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
-
-       gtk_tree_selection_get_selected (priv->cur_selection, &model, &iter);
-
-       return get_account_name_from_folder (model, iter);
-}
-
 static gboolean
 update_model_empty (ModestFolderView *self)
 {
@@ -505,11 +424,10 @@ update_model_empty (ModestFolderView *self)
        gtk_tree_store_append (store, &iter, NULL);
 
        gtk_tree_store_set (store, &iter, 0, _("(empty)"), -1);
-
+       
        gtk_tree_view_set_model (GTK_TREE_VIEW(self),
                                 GTK_TREE_MODEL(store));
        g_object_unref (store);
-
        priv->view_is_empty = TRUE;
 
        g_signal_emit (G_OBJECT(self), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
@@ -562,6 +480,9 @@ update_model (ModestFolderView *self, ModestTnyAccountStore *account_store)
        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 (TRUE, NULL);
@@ -610,7 +531,7 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
        if (!gtk_tree_selection_get_selected (sel, &model, &iter)) {
                priv->cur_folder = NULL; /* FIXME: need this? */
                return; 
-       }
+       }
        
        tree_view = MODEST_FOLDER_VIEW (user_data);
        gtk_tree_model_get (model, &iter,
@@ -620,7 +541,7 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data)
 
        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,
@@ -652,36 +573,25 @@ on_subscription_changed  (TnyStoreAccount *store_account,
 static gboolean
 modest_folder_view_update_model (ModestFolderView *self, TnyAccountStore *account_store)
 {
-       gboolean retval;
-
        g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE);
-       retval = update_model (self, MODEST_TNY_ACCOUNT_STORE(account_store)); /* ugly */
 
        g_signal_emit (G_OBJECT(self), signals[FOLDER_SELECTION_CHANGED_SIGNAL],
                       0, NULL, TRUE);
+       
 
-       return retval;
+       return update_model (self, MODEST_TNY_ACCOUNT_STORE(account_store)); /* ugly */
 }
 
-
-/* ugly */
-static const gchar *
-get_account_name_from_folder (GtkTreeModel *model, GtkTreeIter iter)
+TnyFolder *
+modest_folder_view_get_selected (ModestFolderView *self)
 {
-       GtkTreePath *path;
-       GtkTreeIter new_iter;
-       TnyFolder *account_folder;
-       gint depth, i;
-
-       path = gtk_tree_model_get_path (model, &iter);
-       depth = gtk_tree_path_get_depth (path);
+       ModestFolderViewPrivate *priv;
 
-       for (i = 1; i < depth; ++i)
-               gtk_tree_path_up (path);
+       g_return_val_if_fail (self, NULL);
+       
+       priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
+       if (priv->cur_folder)
+               g_object_ref (priv->cur_folder);
 
-       gtk_tree_model_get_iter (model, &new_iter, path);
-       gtk_tree_model_get (model, &new_iter, 
-                           TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &account_folder, 
-                           -1);
-       return tny_account_get_name (TNY_ACCOUNT (account_folder));
+       return priv->cur_folder;
 }