#include <tny-folder.h>
#include <tny-camel-folder.h>
#include <tny-simple-list.h>
+#include <modest-tny-account.h>
#include <modest-tny-folder.h>
#include <modest-tny-local-folders-account.h>
#include <modest-tny-outbox-account.h>
static void setup_drag_and_drop (GtkTreeView *self);
-static void _clipboard_set_selected_data (ModestFolderView *folder_view, gboolean delete);
+static gboolean _clipboard_set_selected_data (ModestFolderView *folder_view, gboolean delete);
-static void _clear_hidding_filter (ModestFolderView *folder_view);
+static void _clear_hidding_filter (ModestFolderView *folder_view);
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), \
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)
TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance,
-1);
rendobj = G_OBJECT(renderer);
-
+
if (!fname)
return;
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;
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;
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);
}
}
+ /* 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);
}
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,
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;
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));
}
/* 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);
priv->hidding_ids = NULL;
priv->n_selected = 0;
priv->reselect = FALSE;
+ priv->show_non_move = TRUE;
/* Build treeview */
add_columns (GTK_WIDGET (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;
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);
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);
}
/* 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;
retval = !found;
}
-
+
+ if (!priv->show_non_move)
+ {
+ switch (type)
+ {
+ case TNY_FOLDER_TYPE_OUTBOX:
+ case TNY_FOLDER_TYPE_SENT:
+ retval = FALSE;
+ break;
+ default:
+ break;
+ }
+ }
+
/* Free */
g_object_unref (instance);
/* 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);
/* 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);
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;
}
}
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)
+ return 0;
+
if (type == TNY_FOLDER_TYPE_ROOT) {
/* Compare the types, so that
* Remote accounts -> Local account -> MMC account .*/
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;
}
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
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) || */
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));
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);
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
projects / modest / blobdiff