X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-folder-view.c;h=fe8fad949a2263a3719ea360b5d7d88f150807d6;hp=0e35b8df570f67b96ddf982edc0f9850d469ee18;hb=d2766e0125d45ae66dbe70b51eb90e3b0e493982;hpb=d7a56a0d0f7e5b5de5f34312062c7c0ff7097e5d diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c index 0e35b8d..fe8fad9 100644 --- a/src/widgets/modest-folder-view.c +++ b/src/widgets/modest-folder-view.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -65,9 +66,6 @@ static void tny_account_store_view_init (gpointer g, static void modest_folder_view_set_account_store (TnyAccountStoreView *self, TnyAccountStore *account_store); -static gboolean update_model (ModestFolderView *self, - ModestTnyAccountStore *account_store); - static void on_selection_changed (GtkTreeSelection *sel, gpointer data); static void on_account_update (TnyAccountStore *account_store, @@ -237,8 +235,9 @@ text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, ModestFolderViewPrivate *priv; GObject *rendobj; gchar *fname = NULL; - gint unread, all; - TnyFolderType type; + gint unread = 0; + gint all = 0; + TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN; GObject *instance = NULL; g_return_if_fail (column); @@ -271,11 +270,11 @@ text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, gint number = 0; if (modest_tny_folder_is_local_folder (TNY_FOLDER (instance))) { - TnyFolderType type; - type = modest_tny_folder_get_local_folder_type (TNY_FOLDER (instance)); - if (type != TNY_FOLDER_TYPE_UNKNOWN) { + TnyFolderType folder_type + = modest_tny_folder_get_local_folder_type (TNY_FOLDER (instance)); + if (folder_type != TNY_FOLDER_TYPE_UNKNOWN) { g_free (fname); - fname = g_strdup(modest_local_folder_info_get_type_display_name (type)); + fname = g_strdup(modest_local_folder_info_get_type_display_name (folder_type)); } } @@ -336,10 +335,10 @@ icon_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, { GObject *rendobj = NULL, *instance = NULL; GdkPixbuf *pixbuf = NULL; - TnyFolderType type; + TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN; gchar *fname = NULL; const gchar *account_id = NULL; - gint unread; + gint unread = 0; rendobj = G_OBJECT(renderer); gtk_tree_model_get (tree_model, iter, @@ -582,8 +581,8 @@ static void on_account_update (TnyAccountStore *account_store, const gchar *account, gpointer user_data) { - if (!update_model (MODEST_FOLDER_VIEW(user_data), - MODEST_TNY_ACCOUNT_STORE(account_store))) + if (!modest_folder_view_update_model (MODEST_FOLDER_VIEW(user_data), + account_store)) g_printerr ("modest: failed to update model for changes in '%s'", account); } @@ -595,8 +594,7 @@ on_accounts_reloaded (TnyAccountStore *account_store, ModestConf *conf = modest_runtime_get_conf (); modest_widget_memory_save (conf, G_OBJECT (user_data), MODEST_CONF_FOLDER_VIEW_KEY); - update_model (MODEST_FOLDER_VIEW (user_data), - MODEST_TNY_ACCOUNT_STORE(account_store)); + modest_folder_view_update_model (MODEST_FOLDER_VIEW (user_data), account_store); modest_widget_memory_restore (conf, G_OBJECT (user_data), MODEST_CONF_FOLDER_VIEW_KEY); } @@ -635,7 +633,7 @@ modest_folder_view_new (TnyFolderStoreQuery *query) priv->changed_signal = g_signal_connect (sel, "changed", G_CALLBACK (on_selection_changed), self); - return GTK_WIDGET(self); + return GTK_WIDGET(self); } /* this feels dirty; any other way to expand all the root items? */ @@ -663,7 +661,7 @@ filter_row (GtkTreeModel *model, gpointer data) { gboolean retval = TRUE; - gint type = 0; + TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN; GObject *instance = NULL; gtk_tree_model_get (model, iter, @@ -704,21 +702,14 @@ filter_row (GtkTreeModel *model, return retval; } -/* -static void on_tnylist_accounts_debug_print(gpointer data, gpointer user_data) -{ - TnyAccount* account = TNY_ACCOUNT(data); - const gchar *prefix = (const gchar*)(user_data); - - printf("%s account id=%s\n", prefix, tny_account_get_id (account)); -} -*/ - -static gboolean -update_model (ModestFolderView *self, ModestTnyAccountStore *account_store) +gboolean +modest_folder_view_update_model (ModestFolderView *self, + TnyAccountStore *account_store) { ModestFolderViewPrivate *priv; - GtkTreeModel *model; + GtkTreeModel *model /* , *old_model */; + /* TnyAccount *local_account; */ + TnyList *model_as_list; g_return_val_if_fail (account_store, FALSE); @@ -728,7 +719,7 @@ update_model (ModestFolderView *self, ModestTnyAccountStore *account_store) g_signal_emit (G_OBJECT(self), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0, NULL, TRUE); - + /* FIXME: the local accounts are not shown when the query selects only the subscribed folders. */ /* model = tny_gtk_folder_store_tree_model_new (TRUE, priv->query); */ @@ -736,18 +727,14 @@ update_model (ModestFolderView *self, ModestTnyAccountStore *account_store) /* Deal with the model via its TnyList Interface, * filling the TnyList via a get_accounts() call: */ - TnyList *model_as_list = TNY_LIST(model); + model_as_list = TNY_LIST(model); /* Get the accounts: */ tny_account_store_get_accounts (TNY_ACCOUNT_STORE(account_store), model_as_list, TNY_ACCOUNT_STORE_STORE_ACCOUNTS); + g_object_unref (model_as_list); model_as_list = NULL; - - /* - if (account_list) - tny_list_foreach (account_list, on_tnylist_accounts_debug_print, "update_model: "); - */ GtkTreeModel *filter_model = NULL, *sortable = NULL; @@ -773,11 +760,10 @@ update_model (ModestFolderView *self, ModestTnyAccountStore *account_store) (filter_model) ? filter_model : sortable); expand_root_items (self); /* expand all account folders */ - g_object_unref (model); if (filter_model) - g_object_unref (filter_model); + g_object_unref (filter_model); g_object_unref (sortable); @@ -793,7 +779,6 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data) GtkTreeIter iter; ModestFolderView *tree_view; ModestFolderViewPrivate *priv; - gint type; g_return_if_fail (sel); g_return_if_fail (user_data); @@ -816,7 +801,6 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data) tree_view = MODEST_FOLDER_VIEW (user_data); gtk_tree_model_get (model, &iter, - TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type, TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder, -1); @@ -891,8 +875,9 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, gpointer user_data) { gint cmp; - gchar *name1, *name2; - TnyFolderType type; + gchar *name1 = NULL; + gchar *name2 = NULL; + TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN; GObject *folder1 = NULL; GObject *folder2 = NULL; @@ -1046,43 +1031,63 @@ drag_and_drop_from_header_view (GtkTreeModel *source_model, GtkTreePath *dest_row, DndHelper *helper) { - TnyList *headers; - TnyHeader *header; - TnyFolder *folder; - ModestMailOperation *mail_op; + TnyList *headers = NULL; + TnyHeader *header = NULL; + TnyFolder *folder = NULL; + ModestMailOperation *mail_op = NULL; GtkTreeIter source_iter, dest_iter; + g_return_if_fail (GTK_IS_TREE_MODEL(source_model)); + g_return_if_fail (GTK_IS_TREE_MODEL(dest_model)); + g_return_if_fail (dest_row); + g_return_if_fail (helper); + /* Get header */ gtk_tree_model_get_iter (source_model, &source_iter, helper->source_row); gtk_tree_model_get (source_model, &source_iter, TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, &header, -1); - + if (!TNY_IS_HEADER(header)) { + g_warning ("BUG: %s could not get a valid header", __FUNCTION__); + goto cleanup; + } + /* Get Folder */ gtk_tree_model_get_iter (dest_model, &dest_iter, dest_row); gtk_tree_model_get (dest_model, &dest_iter, TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder, -1); + if (!TNY_IS_FOLDER(folder)) { + g_warning ("BUG: %s could not get a valid folder", __FUNCTION__); + goto cleanup; + } + /* Transfer message */ mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, NULL); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); g_signal_connect (G_OBJECT (mail_op), "progress-changed", G_CALLBACK (on_progress_changed), helper); - /* FIXME: I replaced this because the API changed, but D&D - should be reviewed in order to allow multiple drags*/ headers = tny_simple_list_new (); tny_list_append (headers, G_OBJECT (header)); - modest_mail_operation_xfer_msgs (mail_op, headers, folder, helper->delete_source, NULL, NULL); + modest_mail_operation_xfer_msgs (mail_op, + headers, + folder, + helper->delete_source, + NULL, NULL); /* Frees */ - g_object_unref (G_OBJECT (mail_op)); - g_object_unref (G_OBJECT (header)); - g_object_unref (G_OBJECT (folder)); - g_object_unref (headers); +cleanup: + if (G_IS_OBJECT(mail_op)) + g_object_unref (G_OBJECT (mail_op)); + if (G_IS_OBJECT(header)) + g_object_unref (G_OBJECT (header)); + if (G_IS_OBJECT(folder)) + g_object_unref (G_OBJECT (folder)); + if (G_IS_OBJECT(headers)) + g_object_unref (headers); } /* @@ -1556,3 +1561,77 @@ modest_folder_view_get_account_id_of_visible_server_account (ModestFolderView *s return (const gchar *) priv->visible_account_id; } + +static gboolean +find_inbox_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *inbox_iter) +{ + do { + GtkTreeIter child; + TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN; + gchar *name = NULL; + + gtk_tree_model_get (model, iter, + TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &name, + TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, + &type, -1); + + /* + printf ("DEBUG: %s: name=%s, type=%d, TNY_FOLDER_TYPE_INBOX=%d\n", + __FUNCTION__, name, type, TNY_FOLDER_TYPE_INBOX); + */ + + gboolean result = FALSE; + if (type == TNY_FOLDER_TYPE_INBOX) { + result = TRUE; + } else if (type == TNY_FOLDER_TYPE_NORMAL) { + /* tinymail's camel implementation only provides TNY_FOLDER_TYPE_NORMAL + * when getting folders from the cache, before connectin, so we do + * an extra check. We could fix this in tinymail, but it's easier + * to do here. + */ + if (strcmp (name, "Inbox") == 0) + result = TRUE; + } + + g_free (name); + + if (result) { + *inbox_iter = *iter; + return TRUE; + } + + if (gtk_tree_model_iter_children (model, &child, iter)) { + if (find_inbox_iter (model, &child, inbox_iter)) + return TRUE; + } + + } while (gtk_tree_model_iter_next (model, iter)); + + return FALSE; +} + + + +void +modest_folder_view_select_first_inbox_or_local (ModestFolderView *self) +{ + GtkTreeModel *model; + GtkTreeIter iter, inbox_iter; + GtkTreeSelection *sel; + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); + if (!model) + return; + + expand_root_items (self); + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); + + gtk_tree_model_get_iter_first (model, &iter); + if (find_inbox_iter (model, &iter, &inbox_iter)) { + gtk_tree_selection_select_iter (sel, &inbox_iter); + } + else { + gtk_tree_model_get_iter_first (model, &iter); + gtk_tree_selection_select_iter (sel, &iter); + } +}