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,
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;
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();
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);
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;
}
return retval;
}
+
gboolean
modest_folder_view_update_model (ModestFolderView *self,
TnyAccountStore *account_store)
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);
/* 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); */
/* Current folder was unselected */
if (priv->cur_folder_store) {
if (TNY_IS_FOLDER(priv->cur_folder_store))
- tny_folder_sync_async (TNY_FOLDER(priv->cur_folder_store), FALSE, NULL, NULL, NULL);
+ 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;
}
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;
folder copy/move actually occurs, so there could be
situations where the model to be drawn is not correct */
if (!folder1 || !folder2)
- return 0;
+ goto finish;
if (type == TNY_FOLDER_TYPE_ROOT) {
/* Compare the types, so that
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 {
gint cmp1 = 0, cmp2 = 0;
else
cmp = (cmp1 - cmp2);
}
-
+
+finish:
if (folder1)
g_object_unref(G_OBJECT(folder1));
if (folder2)
}
/* 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",
return FALSE;
}
+
+
+
void
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);
}
}
}
+
+/* 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)
{
g_free(priv->hidding_ids);
}
}
+
+
projects / modest / blobdiff