X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-folder-view.c;h=cb6c01232329ec7487f1250a698db309538ea098;hp=e798afcfef4c566cbfb12838c3989a4bef182a89;hb=89c22d9f13bd8849b09a8383e6ea5441da98fca4;hpb=953b423dda6919b6f7c31f65b99ddb3d9fd90012 diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c index e798afc..cb6c012 100644 --- a/src/widgets/modest-folder-view.c +++ b/src/widgets/modest-folder-view.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -125,11 +126,12 @@ static gint expand_row_timeout (gpointer data); static void setup_drag_and_drop (GtkTreeView *self); -static void _clipboard_set_selected_data (ModestFolderView *folder_view, gboolean delete); - -static void _clear_hidding_filter (ModestFolderView *folder_view); +static gboolean _clipboard_set_selected_data (ModestFolderView *folder_view, gboolean delete); +static void _clear_hidding_filter (ModestFolderView *folder_view); +static void on_row_changed_maybe_select_folder (GtkTreeModel *tree_model, GtkTreePath *path, GtkTreeIter *iter, + ModestFolderView *self); enum { FOLDER_SELECTION_CHANGED_SIGNAL, @@ -142,6 +144,8 @@ struct _ModestFolderViewPrivate { TnyAccountStore *account_store; TnyFolderStore *cur_folder_store; + TnyFolder *folder_to_select; /* folder to select after the next update */ + gulong account_update_signal; gulong changed_signal; gulong accounts_reloaded_signal; @@ -163,6 +167,7 @@ struct _ModestFolderViewPrivate { ModestFolderViewStyle style; gboolean reselect; /* we use this to force a reselection of the INBOX */ + gboolean show_non_move; }; #define MODEST_FOLDER_VIEW_GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE((o), \ @@ -249,6 +254,85 @@ modest_folder_view_class_init (ModestFolderViewClass *klass) G_TYPE_NONE, 1, G_TYPE_STRING); } +/* Simplify checks for NULLs: */ +static gboolean strings_are_equal (const gchar *a, const gchar *b) +{ + if (!a && !b) + return TRUE; + if (a && b) + { + return (strcmp (a, b) == 0); + } + else + return FALSE; +} + +static gboolean on_model_foreach_set_name(GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data) +{ + GObject *instance = NULL; + + gtk_tree_model_get (model, iter, + TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance, + -1); + + if (!instance) + return FALSE; /* keep walking */ + + if (!TNY_IS_ACCOUNT (instance)) { + g_object_unref (instance); + return FALSE; /* keep walking */ + } + + /* Check if this is the looked-for account: */ + TnyAccount *this_account = TNY_ACCOUNT (instance); + TnyAccount *account = TNY_ACCOUNT (data); + + const gchar *this_account_id = tny_account_get_id(this_account); + const gchar *account_id = tny_account_get_id(account); + g_object_unref (instance); + instance = NULL; + + /* printf ("DEBUG: %s: this_account_id=%s, account_id=%s\n", __FUNCTION__, this_account_id, account_id); */ + if (strings_are_equal(this_account_id, account_id)) { + /* Tell the model that the data has changed, so that + * it calls the cell_data_func callbacks again: */ + /* TODO: This does not seem to actually cause the new string to be shown: */ + gtk_tree_model_row_changed (model, path, iter); + + return TRUE; /* stop walking */ + } + + return FALSE; /* keep walking */ +} + +typedef struct +{ + ModestFolderView *self; + gchar *previous_name; +} GetMmcAccountNameData; + +static void on_get_mmc_account_name (TnyStoreAccount* account, gpointer user_data) +{ + /* printf ("DEBU1G: %s: account name=%s\n", __FUNCTION__, tny_account_get_name (TNY_ACCOUNT(account))); */ + + GetMmcAccountNameData *data = (GetMmcAccountNameData*)user_data; + + if (!strings_are_equal ( + tny_account_get_name(TNY_ACCOUNT(account)), + data->previous_name)) { + + /* Tell the model that the data has changed, so that + * it calls the cell_data_func callbacks again: */ + ModestFolderView *self = data->self; + GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); + if (model) + gtk_tree_model_foreach(model, on_model_foreach_set_name, account); + } + + g_free (data->previous_name); + g_slice_free (GetMmcAccountNameData, data); +} + static void text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data) @@ -272,7 +356,7 @@ text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance, -1); rendobj = G_OBJECT(renderer); - + if (!fname) return; @@ -281,8 +365,8 @@ text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, return; } - - priv = MODEST_FOLDER_VIEW_GET_PRIVATE (data); + ModestFolderView *self = MODEST_FOLDER_VIEW (data); + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); gchar *item_name = NULL; gint item_weight = 400; @@ -319,6 +403,15 @@ text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, TNY_ACCOUNT (instance))) { item_name = g_strdup (priv->local_account_name); item_weight = 800; + } else if (modest_tny_account_is_memory_card_account ( + TNY_ACCOUNT (instance))) { + /* fname is only correct when the items are first + * added to the model, not when the account is + * changed later, so get the name from the account + * instance: */ + item_name = g_strdup (tny_account_get_name ( + TNY_ACCOUNT (instance))); + item_weight = 800; } else { item_name = g_strdup (fname); item_weight = 800; @@ -333,8 +426,9 @@ text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, g_object_set (rendobj,"text", item_name, "weight", item_weight, NULL); /* Notify display name observers */ + /* TODO: What listens for this signal, and how can it use only the new name? */ if (G_OBJECT (priv->cur_folder_store) == instance) { - g_signal_emit (G_OBJECT(data), + g_signal_emit (G_OBJECT(self), signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0, item_name); } @@ -343,6 +437,24 @@ text_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, } + /* If it is a Memory card account, make sure that we have the correct name. + * This function will be trigerred again when the name has been retrieved: */ + if (TNY_IS_STORE_ACCOUNT (instance) && + modest_tny_account_is_memory_card_account (TNY_ACCOUNT (instance))) { + + /* Get the account name asynchronously: */ + GetMmcAccountNameData *callback_data = + g_slice_new0(GetMmcAccountNameData); + callback_data->self = self; + + const gchar *name = tny_account_get_name (TNY_ACCOUNT(instance)); + if (name) + callback_data->previous_name = g_strdup (name); + + modest_tny_account_get_mmc_account_name (TNY_STORE_ACCOUNT (instance), + on_get_mmc_account_name, callback_data); + } + g_object_unref (G_OBJECT (instance)); g_free (fname); } @@ -359,6 +471,7 @@ icon_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, gchar *fname = NULL; const gchar *account_id = NULL; gint unread = 0; + gboolean has_children; rendobj = G_OBJECT(renderer); gtk_tree_model_get (tree_model, iter, @@ -367,6 +480,7 @@ icon_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, TNY_GTK_FOLDER_STORE_TREE_MODEL_UNREAD_COLUMN, &unread, TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance, -1); + has_children = gtk_tree_model_iter_has_child (tree_model, iter); if (!fname) return; @@ -376,11 +490,11 @@ icon_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, return; } + /* MERGE is not needed anymore as the folder now has the correct type jschmid */ /* We include the MERGE type here because it's used to create the local OUTBOX folder */ if (type == TNY_FOLDER_TYPE_NORMAL || - type == TNY_FOLDER_TYPE_UNKNOWN || - type == TNY_FOLDER_TYPE_MERGE) { + type == TNY_FOLDER_TYPE_UNKNOWN) { type = modest_tny_folder_guess_folder_type (TNY_FOLDER (instance)); } @@ -431,6 +545,39 @@ icon_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer, /* Set pixbuf */ g_object_set (rendobj, "pixbuf", pixbuf, NULL); + if (has_children && (pixbuf != NULL)) { + GdkPixbuf *open_pixbuf, *closed_pixbuf; + GdkPixbuf *open_emblem, *closed_emblem; + open_pixbuf = gdk_pixbuf_copy (pixbuf); + closed_pixbuf = gdk_pixbuf_copy (pixbuf); + open_emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp"); + closed_emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp"); + + if (open_emblem) { + gdk_pixbuf_composite (open_emblem, open_pixbuf, 0, 0, + MIN (gdk_pixbuf_get_width (open_emblem), + gdk_pixbuf_get_width (open_pixbuf)), + MIN (gdk_pixbuf_get_height (open_emblem), + gdk_pixbuf_get_height (open_pixbuf)), + 0, 0, 1, 1, GDK_INTERP_NEAREST, 255); + g_object_set (rendobj, "pixbuf-expander-open", open_pixbuf, NULL); + g_object_unref (open_emblem); + } + if (closed_emblem) { + gdk_pixbuf_composite (closed_emblem, closed_pixbuf, 0, 0, + MIN (gdk_pixbuf_get_width (closed_emblem), + gdk_pixbuf_get_width (closed_pixbuf)), + MIN (gdk_pixbuf_get_height (closed_emblem), + gdk_pixbuf_get_height (closed_pixbuf)), + 0, 0, 1, 1, GDK_INTERP_NEAREST, 255); + g_object_set (rendobj, "pixbuf-expander-closed", closed_pixbuf, NULL); + g_object_unref (closed_emblem); + } + if (closed_pixbuf) + g_object_unref (closed_pixbuf); + if (open_pixbuf) + g_object_unref (open_pixbuf); + } if (pixbuf != NULL) g_object_unref (pixbuf); @@ -486,6 +633,7 @@ modest_folder_view_init (ModestFolderView *obj) priv->style = MODEST_FOLDER_VIEW_STYLE_SHOW_ALL; priv->cur_folder_store = NULL; priv->visible_account_id = NULL; + priv->folder_to_select = NULL; /* Initialize the local account name */ conf = modest_runtime_get_conf(); @@ -496,6 +644,7 @@ modest_folder_view_init (ModestFolderView *obj) priv->hidding_ids = NULL; priv->n_selected = 0; priv->reselect = FALSE; + priv->show_non_move = TRUE; /* Build treeview */ add_columns (GTK_WIDGET (obj)); @@ -559,6 +708,11 @@ modest_folder_view_finalize (GObject *obj) priv->query = NULL; } + if (priv->folder_to_select) { + g_object_unref (G_OBJECT(priv->folder_to_select)); + priv->folder_to_select = NULL; + } + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(obj)); if (sel) g_signal_handler_disconnect (G_OBJECT(sel), priv->changed_signal); @@ -574,8 +728,8 @@ modest_folder_view_finalize (GObject *obj) if (priv->cur_folder_store) { if (TNY_IS_FOLDER(priv->cur_folder_store)) - tny_folder_sync (TNY_FOLDER(priv->cur_folder_store), TRUE, NULL); - /* expunge the message */ + tny_folder_sync (TNY_FOLDER(priv->cur_folder_store), FALSE, NULL); + /* FALSE --> expunge the message */ g_object_unref (priv->cur_folder_store); priv->cur_folder_store = NULL; @@ -662,10 +816,13 @@ on_account_update (TnyAccountStore *account_store, const gchar *account, gpointer user_data) { - ModestFolderView *self = MODEST_FOLDER_VIEW (user_data); + ModestFolderView *self = NULL; ModestFolderViewPrivate *priv; + g_return_if_fail (MODEST_IS_FOLDER_VIEW (user_data)); + self = MODEST_FOLDER_VIEW (user_data); priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); + if (!priv->visible_account_id) modest_widget_memory_restore (modest_runtime_get_conf(), G_OBJECT(self), MODEST_CONF_FOLDER_VIEW_KEY); @@ -679,6 +836,7 @@ static void on_accounts_reloaded (TnyAccountStore *account_store, gpointer user_data) { + g_return_if_fail (MODEST_IS_FOLDER_VIEW (user_data)); modest_folder_view_update_model (MODEST_FOLDER_VIEW (user_data), account_store); } @@ -712,7 +870,13 @@ modest_folder_view_on_map (ModestFolderView *self, /* This won't happen often */ if (G_UNLIKELY (priv->reselect)) { /* Select the first inbox or the local account if not found */ - modest_folder_view_select_first_inbox_or_local (self); + + /* TODO: this could cause a lock at startup, so we + comment it for the moment. We know that this will + be a bug, because the INBOX is not selected, but we + need to rewrite some parts of Modest to avoid the + deathlock situation */ +/* modest_folder_view_select_first_inbox_or_local (self); */ priv->reselect = FALSE; } return FALSE; @@ -824,13 +988,40 @@ filter_row (GtkTreeModel *model, retval = !found; } - + + + /* If this is a move to dialog, hide Sent, Outbox and Drafts + folder as no message can be move there according to UI specs */ + if (!priv->show_non_move) + { + switch (type) + { + case TNY_FOLDER_TYPE_OUTBOX: + case TNY_FOLDER_TYPE_SENT: + case TNY_FOLDER_TYPE_DRAFTS: + retval = FALSE; + break; + case TNY_FOLDER_TYPE_UNKNOWN: + case TNY_FOLDER_TYPE_NORMAL: + type = modest_tny_folder_guess_folder_type(TNY_FOLDER(instance)); + if (type == TNY_FOLDER_TYPE_OUTBOX || type == TNY_FOLDER_TYPE_SENT + || type == TNY_FOLDER_TYPE_DRAFTS) + { + retval = FALSE; + } + break; + default: + break; + } + } + /* Free */ g_object_unref (instance); return retval; } + gboolean modest_folder_view_update_model (ModestFolderView *self, TnyAccountStore *account_store) @@ -840,6 +1031,7 @@ modest_folder_view_update_model (ModestFolderView *self, /* TnyAccount *local_account; */ TnyList *model_as_list; + g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE); g_return_val_if_fail (account_store, FALSE); priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self); @@ -877,7 +1069,7 @@ modest_folder_view_update_model (ModestFolderView *self, 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); + cmp_rows, NULL, NULL); /* Create filter model */ filter_model = gtk_tree_model_filter_new (sortable, NULL); @@ -895,6 +1087,13 @@ modest_folder_view_update_model (ModestFolderView *self, /* Set new model */ gtk_tree_view_set_model (GTK_TREE_VIEW(self), filter_model); + g_signal_connect (G_OBJECT(filter_model), "row-changed", + (GCallback)on_row_changed_maybe_select_folder, self); + g_signal_connect (G_OBJECT(filter_model), "row-inserted", + (GCallback)on_row_changed_maybe_select_folder, self); + + + /* gtk_tree_view_set_model (GTK_TREE_VIEW(self), */ /* (filter_model) ? filter_model : sortable); */ @@ -948,11 +1147,12 @@ on_selection_changed (GtkTreeSelection *sel, gpointer user_data) /* Current folder was unselected */ if (priv->cur_folder_store) { if (TNY_IS_FOLDER(priv->cur_folder_store)) - tny_folder_sync (TNY_FOLDER(priv->cur_folder_store), TRUE, NULL); - /* expunge the message */ + tny_folder_sync_async (TNY_FOLDER(priv->cur_folder_store), + FALSE, NULL, NULL, NULL); + /* FALSE --> don't expunge the messages */ g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0, - priv->cur_folder_store, FALSE); + priv->cur_folder_store, FALSE); g_object_unref (priv->cur_folder_store); priv->cur_folder_store = NULL; } @@ -1007,21 +1207,24 @@ get_cmp_rows_type_pos (GObject *folder) static gint get_cmp_subfolder_type_pos (TnyFolderType t) { - /* Outbox, Drafts, Sent, User */ - /* 0, 1, 2, 3 */ + /* Inbox, Outbox, Drafts, Sent, User */ + /* 0, 1, 2, 3, 4 */ switch (t) { - case TNY_FOLDER_TYPE_OUTBOX: + case TNY_FOLDER_TYPE_INBOX: return 0; break; - case TNY_FOLDER_TYPE_DRAFTS: + case TNY_FOLDER_TYPE_OUTBOX: return 1; break; - case TNY_FOLDER_TYPE_SENT: + case TNY_FOLDER_TYPE_DRAFTS: return 2; break; - default: + case TNY_FOLDER_TYPE_SENT: return 3; + break; + default: + return 4; } } @@ -1035,7 +1238,7 @@ static gint cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, gpointer user_data) { - gint cmp; + gint cmp = 0; gchar *name1 = NULL; gchar *name2 = NULL; TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN; @@ -1054,6 +1257,13 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder2, -1); + /* Return if we get no folder. This could happen when folder + operations are happening. The model is updated after the + folder copy/move actually occurs, so there could be + situations where the model to be drawn is not correct */ + if (!folder1 || !folder2) + goto finish; + if (type == TNY_FOLDER_TYPE_ROOT) { /* Compare the types, so that * Remote accounts -> Local account -> MMC account .*/ @@ -1079,22 +1289,24 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, const gchar *account_id = account1 ? tny_account_get_id (account1) : NULL; const gchar *account_id2 = account2 ? tny_account_get_id (account2) : NULL; - if (!account_id && !account_id2) - return 0; - else if (!account_id) - return -1; - else if (!account_id2) - return +1; - else if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) + if (!account_id && !account_id2) { + cmp = 0; + } else if (!account_id) { + cmp = -1; + } else if (!account_id2) { cmp = +1; - else + } else if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) { + cmp = +1; + } else { cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE); + } } } else { - GtkTreeIter parent; - gboolean has_parent; gint cmp1 = 0, cmp2 = 0; /* get the parent to know if it's a local folder */ + + GtkTreeIter parent; + gboolean has_parent; has_parent = gtk_tree_model_iter_parent (tree_model, &parent, iter1); if (has_parent) { GObject *parent_folder; @@ -1111,12 +1323,20 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, } g_object_unref (parent_folder); } + + /* if they are not local folders */ + if (cmp1 == cmp2) { + cmp1 = get_cmp_subfolder_type_pos (tny_folder_get_folder_type (TNY_FOLDER (folder1))); + cmp2 = get_cmp_subfolder_type_pos (tny_folder_get_folder_type (TNY_FOLDER (folder2))); + } + if (cmp1 == cmp2) cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE); else cmp = (cmp1 - cmp2); } - + +finish: if (folder1) g_object_unref(G_OBJECT(folder1)); if (folder2) @@ -1250,7 +1470,10 @@ drag_and_drop_from_header_view (GtkTreeModel *source_model, } /* Transfer message */ - mail_op = modest_mail_operation_new (MODEST_MAIL_OPERATION_TYPE_RECEIVE, NULL); + mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, + NULL, + modest_ui_actions_move_folder_error_handler, + NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); g_signal_connect (G_OBJECT (mail_op), "progress-changed", @@ -1288,10 +1511,10 @@ drag_and_drop_from_folder_view (GtkTreeModel *source_model, GtkSelectionData *selection_data, DndHelper *helper) { - ModestMailOperation *mail_op; + ModestMailOperation *mail_op = NULL; GtkTreeIter parent_iter, iter; - TnyFolderStore *parent_folder; - TnyFolder *folder; + TnyFolderStore *parent_folder = NULL; + TnyFolder *folder = NULL; /* Check if the drag is possible */ /* if (!gtk_tree_path_compare (helper->source_row, dest_row) || */ @@ -1316,20 +1539,26 @@ drag_and_drop_from_folder_view (GtkTreeModel *source_model, TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder, -1); - /* Do the mail operation */ - mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, + /* Offer the connection dialog if necessary, for the destination parent folder and source folder: */ + if (modest_platform_connect_and_wait_if_network_folderstore (NULL, parent_folder) && + modest_platform_connect_and_wait_if_network_folderstore (NULL, TNY_FOLDER_STORE (folder))) { + /* Do the mail operation */ + mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, NULL, modest_ui_actions_move_folder_error_handler, NULL); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + 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); + g_signal_connect (G_OBJECT (mail_op), "progress-changed", + G_CALLBACK (on_progress_changed), helper); - modest_mail_operation_xfer_folder (mail_op, + modest_mail_operation_xfer_folder (mail_op, folder, parent_folder, - helper->delete_source); + helper->delete_source, + NULL, + NULL); + } /* Frees */ g_object_unref (G_OBJECT (parent_folder)); @@ -1812,6 +2041,9 @@ find_inbox_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *inbox_iter return FALSE; } + + + void modest_folder_view_select_first_inbox_or_local (ModestFolderView *self) { @@ -1831,6 +2063,8 @@ modest_folder_view_select_first_inbox_or_local (ModestFolderView *self) sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); gtk_tree_model_get_iter_first (model, &iter); + gtk_tree_selection_unselect_all (sel); + if (find_inbox_iter (model, &iter, &inbox_iter)) { gtk_tree_selection_select_iter (sel, &inbox_iter); } @@ -1840,6 +2074,125 @@ modest_folder_view_select_first_inbox_or_local (ModestFolderView *self) } } + +/* recursive */ +static gboolean +find_folder_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *folder_iter, + TnyFolder* folder) +{ + do { + GtkTreeIter child; + TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN; + TnyFolder* a_folder; + gchar *name = NULL; + + gtk_tree_model_get (model, iter, + TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &a_folder, + TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, &name, + TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type, + -1); + + g_debug ("===> %s (%p ---- %p)", name, a_folder, folder); + g_free (name); + + if (folder == a_folder) { + g_object_unref (a_folder); + *folder_iter = *iter; + return TRUE; + } + g_object_unref (a_folder); + + if (gtk_tree_model_iter_children (model, &child, iter)) { + if (find_folder_iter (model, &child, folder_iter, folder)) + return TRUE; + } + + } while (gtk_tree_model_iter_next (model, iter)); + + return FALSE; +} + + +static void +on_row_changed_maybe_select_folder (GtkTreeModel *tree_model, GtkTreePath *path, GtkTreeIter *iter, + ModestFolderView *self) +{ + ModestFolderViewPrivate *priv = NULL; + GtkTreeSelection *sel; + + if (!MODEST_IS_FOLDER_VIEW(self)) + return; + + g_return_if_fail (MODEST_IS_FOLDER_VIEW (self)); + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); + + + if (priv->folder_to_select) { + + if (!modest_folder_view_select_folder (self, priv->folder_to_select, + FALSE)) { + GtkTreePath *path; + path = gtk_tree_model_get_path (tree_model, iter); + gtk_tree_view_expand_to_path (GTK_TREE_VIEW(self), path); + + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); + + gtk_tree_selection_select_iter (sel, iter); + gtk_tree_view_set_cursor (GTK_TREE_VIEW(self), path, NULL, FALSE); + + gtk_tree_path_free (path); + + } + g_object_unref (priv->folder_to_select); + priv->folder_to_select = NULL; + } +} + + +gboolean +modest_folder_view_select_folder (ModestFolderView *self, TnyFolder *folder, + gboolean after_change) +{ + GtkTreeModel *model; + GtkTreeIter iter, folder_iter; + GtkTreeSelection *sel; + ModestFolderViewPrivate *priv = NULL; + + g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE); + g_return_val_if_fail (TNY_IS_FOLDER (folder), FALSE); + + priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self); + + if (after_change) { + if (priv->folder_to_select) + g_object_unref(priv->folder_to_select); + priv->folder_to_select = TNY_FOLDER(g_object_ref(folder)); + return TRUE; + } + + model = gtk_tree_view_get_model (GTK_TREE_VIEW (self)); + if (!model) + return FALSE; + + + gtk_tree_model_get_iter_first (model, &iter); + if (find_folder_iter (model, &iter, &folder_iter, folder)) { + GtkTreePath *path; + + path = gtk_tree_model_get_path (model, &folder_iter); + gtk_tree_view_expand_to_path (GTK_TREE_VIEW(self), path); + + sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self)); + gtk_tree_selection_select_iter (sel, &folder_iter); + gtk_tree_view_set_cursor (GTK_TREE_VIEW(self), path, NULL, FALSE); + + gtk_tree_path_free (path); + return TRUE; + } + return FALSE; +} + + void modest_folder_view_copy_selection (ModestFolderView *folder_view) { @@ -1859,7 +2212,8 @@ modest_folder_view_cut_selection (ModestFolderView *folder_view) priv = MODEST_FOLDER_VIEW_GET_PRIVATE (folder_view); /* Copy selection */ - _clipboard_set_selected_data (folder_view, TRUE); + if (!_clipboard_set_selected_data (folder_view, TRUE)) + return; /* Get hidding ids */ hidding = modest_email_clipboard_get_hidding_ids (priv->clipboard, &n_selected); @@ -1878,23 +2232,42 @@ modest_folder_view_cut_selection (ModestFolderView *folder_view) gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model)); } -static void +void +modest_folder_view_show_non_move_folders (ModestFolderView *folder_view, + gboolean show) +{ + ModestFolderViewPrivate* priv = MODEST_FOLDER_VIEW_GET_PRIVATE(folder_view); + priv->show_non_move = show; + modest_folder_view_update_model(folder_view, + TNY_ACCOUNT_STORE(modest_runtime_get_account_store())); +} + +/* Returns FALSE if it did not selected anything */ +static gboolean _clipboard_set_selected_data (ModestFolderView *folder_view, gboolean delete) { ModestFolderViewPrivate *priv = NULL; TnyFolderStore *folder = NULL; + gboolean retval = FALSE; - g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view)); + g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (folder_view), FALSE); priv = MODEST_FOLDER_VIEW_GET_PRIVATE (folder_view); /* Set selected data on clipboard */ - g_return_if_fail (MODEST_IS_EMAIL_CLIPBOARD (priv->clipboard)); + g_return_val_if_fail (MODEST_IS_EMAIL_CLIPBOARD (priv->clipboard), FALSE); folder = modest_folder_view_get_selected (folder_view); - modest_email_clipboard_set_data (priv->clipboard, TNY_FOLDER(folder), NULL, delete); + + /* Do not allow to select an account */ + if (TNY_IS_FOLDER (folder)) { + modest_email_clipboard_set_data (priv->clipboard, TNY_FOLDER(folder), NULL, delete); + retval = TRUE; + } /* Free */ g_object_unref (folder); + + return retval; } static void @@ -1912,3 +2285,5 @@ _clear_hidding_filter (ModestFolderView *folder_view) g_free(priv->hidding_ids); } } + +