#include <modest-marshal.h>
#include <modest-icon-names.h>
#include <modest-tny-account-store.h>
+#include <modest-tny-local-folders-account.h>
#include <modest-text-utils.h>
#include <modest-runtime.h>
#include "modest-folder-view.h"
static void modest_folder_view_init (ModestFolderView *obj);
static void modest_folder_view_finalize (GObject *obj);
-static void tny_account_store_view_init (gpointer g,
+static void tny_account_store_view_init (gpointer g,
gpointer iface_data);
-static void modest_folder_view_set_account_store (TnyAccountStoreView *self,
+static void modest_folder_view_set_account_store (TnyAccountStoreView *self,
TnyAccountStore *account_store);
-static void on_selection_changed (GtkTreeSelection *sel,
+static void on_selection_changed (GtkTreeSelection *sel,
gpointer data);
-static void on_account_removed (TnyAccountStore *self,
+static void on_account_removed (TnyAccountStore *self,
TnyAccount *account,
gpointer user_data);
-static void on_account_inserted (TnyAccountStore *self,
+static void on_account_inserted (TnyAccountStore *self,
TnyAccount *account,
gpointer user_data);
-static void on_account_changed (TnyAccountStore *self,
+static void on_account_changed (TnyAccountStore *self,
TnyAccount *account,
gpointer user_data);
-static gint cmp_rows (GtkTreeModel *tree_model,
- GtkTreeIter *iter1,
+static gint cmp_rows (GtkTreeModel *tree_model,
+ GtkTreeIter *iter1,
GtkTreeIter *iter2,
gpointer user_data);
GdkEventKey *event,
gpointer user_data);
-static void on_configuration_key_changed (ModestConf* conf,
- const gchar *key,
+static void on_configuration_key_changed (ModestConf* conf,
+ const gchar *key,
ModestConfEvent event,
- ModestConfNotificationId notification_id,
+ ModestConfNotificationId notification_id,
ModestFolderView *self);
/* DnD functions */
-static void on_drag_data_get (GtkWidget *widget,
- GdkDragContext *context,
- GtkSelectionData *selection_data,
- guint info,
- guint time,
+static void on_drag_data_get (GtkWidget *widget,
+ GdkDragContext *context,
+ GtkSelectionData *selection_data,
+ guint info,
+ guint time,
gpointer data);
-static void on_drag_data_received (GtkWidget *widget,
- GdkDragContext *context,
- gint x,
- gint y,
- GtkSelectionData *selection_data,
- guint info,
- guint time,
+static void on_drag_data_received (GtkWidget *widget,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ GtkSelectionData *selection_data,
+ guint info,
+ guint time,
gpointer data);
static gboolean on_drag_motion (GtkWidget *widget,
static void setup_drag_and_drop (GtkTreeView *self);
-static gboolean _clipboard_set_selected_data (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_inserted_maybe_select_folder (GtkTreeModel *tree_model,
- GtkTreePath *path,
+static void on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model,
+ GtkTreePath *path,
GtkTreeIter *iter,
ModestFolderView *self);
-static void on_display_name_changed (ModestAccountMgr *self,
+static void on_display_name_changed (ModestAccountMgr *self,
const gchar *account,
gpointer user_data);
gulong account_changed_signal;
gulong conf_key_signal;
gulong display_name_changed_signal;
-
+
/* not unref this object, its a singlenton */
ModestEmailClipboard *clipboard;
/* globals */
static GObjectClass *parent_class = NULL;
-static guint signals[LAST_SIGNAL] = {0};
+static guint signals[LAST_SIGNAL] = {0};
GType
modest_folder_view_get_type (void)
NULL /* interface_data */
};
-
+
my_type = g_type_register_static (GTK_TYPE_TREE_VIEW,
"ModestFolderView",
&my_info, 0);
- g_type_add_interface_static (my_type,
- TNY_TYPE_ACCOUNT_STORE_VIEW,
+ g_type_add_interface_static (my_type,
+ TNY_TYPE_ACCOUNT_STORE_VIEW,
&tny_account_store_view_info);
}
return my_type;
modest_folder_view_class_init (ModestFolderViewClass *klass)
{
GObjectClass *gobject_class;
+ GtkTreeViewClass *treeview_class;
gobject_class = (GObjectClass*) klass;
+ treeview_class = (GtkTreeViewClass*) klass;
parent_class = g_type_class_peek_parent (klass);
gobject_class->finalize = modest_folder_view_finalize;
g_type_class_add_private (gobject_class,
sizeof(ModestFolderViewPrivate));
-
- signals[FOLDER_SELECTION_CHANGED_SIGNAL] =
+
+ signals[FOLDER_SELECTION_CHANGED_SIGNAL] =
g_signal_new ("folder_selection_changed",
G_TYPE_FROM_CLASS (gobject_class),
G_SIGNAL_RUN_FIRST,
* the unread messages count to the folder name to build the
* folder display name
*/
- signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL] =
+ signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL] =
g_signal_new ("folder-display-name-changed",
G_TYPE_FROM_CLASS (gobject_class),
G_SIGNAL_RUN_FIRST,
NULL, NULL,
g_cclosure_marshal_VOID__STRING,
G_TYPE_NONE, 1, G_TYPE_STRING);
+
+ treeview_class->select_cursor_parent = NULL;
+
}
/* Simplify checks for NULLs: */
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 */
- }
-
+ 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);
* 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
+typedef struct
{
ModestFolderView *self;
gchar *previous_name;
/* 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)),
+ tny_account_get_name(TNY_ACCOUNT(account)),
data->previous_name)) {
-
- /* Tell the model that the data has changed, so that
+
+ /* 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));
}
static void
-text_cell_data (GtkTreeViewColumn *column,
+text_cell_data (GtkTreeViewColumn *column,
GtkCellRenderer *renderer,
- GtkTreeModel *tree_model,
- GtkTreeIter *iter,
+ GtkTreeModel *tree_model,
+ GtkTreeIter *iter,
gpointer data)
{
ModestFolderViewPrivate *priv;
TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance,
-1);
-
- if (!fname)
- return;
-
- if (!instance) {
- g_free (fname);
- return;
- }
+ if (!fname || !instance)
+ goto end;
ModestFolderView *self = MODEST_FOLDER_VIEW (data);
priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
-
+
gchar *item_name = NULL;
gint item_weight = 400;
-
+
if (type != TNY_FOLDER_TYPE_ROOT) {
gint number = 0;
-
+
if (modest_tny_folder_is_local_folder (TNY_FOLDER (instance)) ||
modest_tny_folder_is_memory_card_folder (TNY_FOLDER (instance))) {
type = modest_tny_folder_get_local_or_mmc_folder_type (TNY_FOLDER (instance));
g_free (fname);
fname = g_strdup (modest_local_folder_info_get_type_display_name (type));
}
+ } else {
+ /* Sometimes an special folder is reported by the server as
+ NORMAL, like some versions of Dovecot */
+ if (type == TNY_FOLDER_TYPE_NORMAL ||
+ type == TNY_FOLDER_TYPE_UNKNOWN) {
+ type = modest_tny_folder_guess_folder_type (TNY_FOLDER (instance));
+ }
}
/* note: we cannot reliably get the counts from the tree model, we need
number = tny_folder_get_all_count (TNY_FOLDER(instance));
else
number = tny_folder_get_unread_count (TNY_FOLDER(instance));
-
+
/* Use bold font style if there are unread or unset messages */
if (number > 0) {
- item_name = g_strdup_printf ("%s (%d)", fname, number);
+ if (type == TNY_FOLDER_TYPE_INBOX)
+ item_name = g_strdup_printf ("%s (%d)", _("mcen_me_folder_inbox"), number);
+ else
+ item_name = g_strdup_printf ("%s (%d)", fname, number);
item_weight = 800;
} else {
- item_name = g_strdup (fname);
+ if (type == TNY_FOLDER_TYPE_INBOX)
+ item_name = g_strdup (_("mcen_me_folder_inbox"));
+ else
+ item_name = g_strdup (fname);
item_weight = 400;
}
-
+
} else if (TNY_IS_ACCOUNT (instance)) {
/* If it's a server account */
if (modest_tny_account_is_virtual_local_folders (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
+ /* 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;
}
}
-
+
if (!item_name)
item_name = g_strdup ("unknown");
-
+
if (item_name && item_weight) {
/* Set the name in the treeview cell: */
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 (((GObject *) priv->cur_folder_store) == instance) {
item_name);
}
g_free (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) &&
+ if (TNY_IS_STORE_ACCOUNT (instance) &&
modest_tny_account_is_memory_card_account (TNY_ACCOUNT (instance))) {
/* Get the account name asynchronously: */
- GetMmcAccountNameData *callback_data =
+ 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);
+ callback_data->previous_name = g_strdup (name);
- modest_tny_account_get_mmc_account_name (TNY_STORE_ACCOUNT (instance),
+ 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);
+ end:
+ if (instance)
+ g_object_unref (G_OBJECT (instance));
+ if (fname)
+ g_free (fname);
}
} ThreePixbufs;
+static inline GdkPixbuf *
+get_composite_pixbuf (const gchar *icon_name,
+ const gint size,
+ GdkPixbuf *base_pixbuf)
+{
+ GdkPixbuf *emblem, *retval = NULL;
+
+ emblem = modest_platform_get_icon (icon_name, size);
+ if (emblem) {
+ retval = gdk_pixbuf_copy (base_pixbuf);
+ gdk_pixbuf_composite (emblem, retval, 0, 0,
+ MIN (gdk_pixbuf_get_width (emblem),
+ gdk_pixbuf_get_width (retval)),
+ MIN (gdk_pixbuf_get_height (emblem),
+ gdk_pixbuf_get_height (retval)),
+ 0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
+ g_object_unref (emblem);
+ }
+ return retval;
+}
+
+static inline ThreePixbufs *
+get_composite_icons (const gchar *icon_code,
+ GdkPixbuf **pixbuf,
+ GdkPixbuf **pixbuf_open,
+ GdkPixbuf **pixbuf_close)
+{
+ ThreePixbufs *retval;
+
+ if (!*pixbuf)
+ *pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (icon_code, MODEST_ICON_SIZE_SMALL));
+
+ if (!*pixbuf_open)
+ *pixbuf_open = get_composite_pixbuf ("qgn_list_gene_fldr_exp",
+ MODEST_ICON_SIZE_SMALL,
+ *pixbuf);
+
+ if (!*pixbuf_close)
+ *pixbuf_close = get_composite_pixbuf ("qgn_list_gene_fldr_clp",
+ MODEST_ICON_SIZE_SMALL,
+ *pixbuf);
+
+ retval = g_slice_new0 (ThreePixbufs);
+ if (*pixbuf)
+ retval->pixbuf = g_object_ref (*pixbuf);
+ if (*pixbuf_open)
+ retval->pixbuf_open = g_object_ref (*pixbuf_open);
+ if (*pixbuf_close)
+ retval->pixbuf_close = g_object_ref (*pixbuf_close);
+
+ return retval;
+}
+
static ThreePixbufs*
get_folder_icons (TnyFolderType type, GObject *instance)
{
- GdkPixbuf *pixbuf = NULL;
- GdkPixbuf *pixbuf_open = NULL;
- GdkPixbuf *pixbuf_close = NULL;
- ThreePixbufs *retval = g_slice_new (ThreePixbufs);
-
static GdkPixbuf *inbox_pixbuf = NULL, *outbox_pixbuf = NULL,
*junk_pixbuf = NULL, *sent_pixbuf = NULL,
*trash_pixbuf = NULL, *draft_pixbuf = NULL,
- *normal_pixbuf = NULL, *anorm_pixbuf = NULL,
+ *normal_pixbuf = NULL, *anorm_pixbuf = NULL,
*ammc_pixbuf = NULL, *avirt_pixbuf = NULL;
static GdkPixbuf *inbox_pixbuf_open = NULL, *outbox_pixbuf_open = NULL,
*junk_pixbuf_open = NULL, *sent_pixbuf_open = NULL,
*trash_pixbuf_open = NULL, *draft_pixbuf_open = NULL,
- *normal_pixbuf_open = NULL, *anorm_pixbuf_open = NULL,
+ *normal_pixbuf_open = NULL, *anorm_pixbuf_open = NULL,
*ammc_pixbuf_open = NULL, *avirt_pixbuf_open = NULL;
static GdkPixbuf *inbox_pixbuf_close = NULL, *outbox_pixbuf_close = NULL,
*junk_pixbuf_close = NULL, *sent_pixbuf_close = NULL,
*trash_pixbuf_close = NULL, *draft_pixbuf_close = NULL,
- *normal_pixbuf_close = NULL, *anorm_pixbuf_close = NULL,
+ *normal_pixbuf_close = NULL, *anorm_pixbuf_close = NULL,
*ammc_pixbuf_close = NULL, *avirt_pixbuf_close = NULL;
+ ThreePixbufs *retval = NULL;
- /* 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 ||
+ /* Sometimes an special folder is reported by the server as
+ NORMAL, like some versions of Dovecot */
+ if (type == TNY_FOLDER_TYPE_NORMAL ||
type == TNY_FOLDER_TYPE_UNKNOWN) {
- type = modest_tny_folder_guess_folder_type (TNY_FOLDER (instance));
+ type = modest_tny_folder_guess_folder_type (TNY_FOLDER (instance));
}
switch (type) {
case TNY_FOLDER_TYPE_INVALID:
g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
break;
-
+
case TNY_FOLDER_TYPE_ROOT:
if (TNY_IS_ACCOUNT (instance)) {
-
- if (modest_tny_account_is_virtual_local_folders (
- TNY_ACCOUNT (instance))) {
-
- if (!avirt_pixbuf)
- avirt_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_LOCAL_FOLDERS));
-
- if (!avirt_pixbuf_open) {
- GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp");
- avirt_pixbuf_open = gdk_pixbuf_copy (avirt_pixbuf);
- gdk_pixbuf_composite (emblem, avirt_pixbuf_open, 0, 0,
- MIN (gdk_pixbuf_get_width (emblem),
- gdk_pixbuf_get_width (avirt_pixbuf_open)),
- MIN (gdk_pixbuf_get_height (emblem),
- gdk_pixbuf_get_height (avirt_pixbuf_open)),
- 0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
- g_object_unref (emblem);
- }
-
- if (!avirt_pixbuf_close) {
- GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp");
- avirt_pixbuf_close = gdk_pixbuf_copy (avirt_pixbuf);
- gdk_pixbuf_composite (emblem, avirt_pixbuf_close, 0, 0,
- MIN (gdk_pixbuf_get_width (emblem),
- gdk_pixbuf_get_width (avirt_pixbuf_close)),
- MIN (gdk_pixbuf_get_height (emblem),
- gdk_pixbuf_get_height (avirt_pixbuf_close)),
- 0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
- g_object_unref (emblem);
- }
-
-
- pixbuf = g_object_ref (avirt_pixbuf);
- pixbuf_open = g_object_ref (avirt_pixbuf_open);
- pixbuf_close = g_object_ref (avirt_pixbuf_close);
- }
- else {
+ if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (instance))) {
+ retval = get_composite_icons (MODEST_FOLDER_ICON_LOCAL_FOLDERS,
+ &avirt_pixbuf,
+ &avirt_pixbuf_open,
+ &avirt_pixbuf_close);
+ } else {
const gchar *account_id = tny_account_get_id (TNY_ACCOUNT (instance));
-
- if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) {
- if (!ammc_pixbuf)
- ammc_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_MMC));
-
- if (!ammc_pixbuf_open) {
- GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp");
- ammc_pixbuf_open = gdk_pixbuf_copy (ammc_pixbuf);
- gdk_pixbuf_composite (emblem, ammc_pixbuf_open, 0, 0,
- MIN (gdk_pixbuf_get_width (emblem),
- gdk_pixbuf_get_width (ammc_pixbuf_open)),
- MIN (gdk_pixbuf_get_height (emblem),
- gdk_pixbuf_get_height (ammc_pixbuf_open)),
- 0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
- g_object_unref (emblem);
- }
-
- if (!ammc_pixbuf_close) {
- GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp");
- ammc_pixbuf_close = gdk_pixbuf_copy (ammc_pixbuf);
- gdk_pixbuf_composite (emblem, ammc_pixbuf_close, 0, 0,
- MIN (gdk_pixbuf_get_width (emblem),
- gdk_pixbuf_get_width (ammc_pixbuf_close)),
- MIN (gdk_pixbuf_get_height (emblem),
- gdk_pixbuf_get_height (ammc_pixbuf_close)),
- 0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
- g_object_unref (emblem);
- }
-
-
- pixbuf = g_object_ref (ammc_pixbuf);
- pixbuf_open = g_object_ref (ammc_pixbuf_open);
- pixbuf_close = g_object_ref (ammc_pixbuf_close);
+ if (!strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) {
+ retval = get_composite_icons (MODEST_FOLDER_ICON_MMC,
+ &ammc_pixbuf,
+ &ammc_pixbuf_open,
+ &ammc_pixbuf_close);
} else {
-
- if (!anorm_pixbuf)
- anorm_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_ACCOUNT));
-
- if (!anorm_pixbuf_open) {
- GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp");
- anorm_pixbuf_open = gdk_pixbuf_copy (anorm_pixbuf);
- gdk_pixbuf_composite (emblem, anorm_pixbuf_open, 0, 0,
- MIN (gdk_pixbuf_get_width (emblem),
- gdk_pixbuf_get_width (anorm_pixbuf_open)),
- MIN (gdk_pixbuf_get_height (emblem),
- gdk_pixbuf_get_height (anorm_pixbuf_open)),
- 0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
- g_object_unref (emblem);
- }
-
- if (!anorm_pixbuf_close) {
- GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp");
- anorm_pixbuf_close = gdk_pixbuf_copy (anorm_pixbuf);
- gdk_pixbuf_composite (emblem, anorm_pixbuf_close, 0, 0,
- MIN (gdk_pixbuf_get_width (emblem),
- gdk_pixbuf_get_width (anorm_pixbuf_close)),
- MIN (gdk_pixbuf_get_height (emblem),
- gdk_pixbuf_get_height (anorm_pixbuf_close)),
- 0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
- g_object_unref (emblem);
- }
-
-
- pixbuf = g_object_ref (anorm_pixbuf);
- pixbuf_open = g_object_ref (anorm_pixbuf_open);
- pixbuf_close = g_object_ref (anorm_pixbuf_close);
-
+ retval = get_composite_icons (MODEST_FOLDER_ICON_ACCOUNT,
+ &anorm_pixbuf,
+ &anorm_pixbuf_open,
+ &anorm_pixbuf_close);
}
}
}
break;
case TNY_FOLDER_TYPE_INBOX:
-
- if (!inbox_pixbuf)
- inbox_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_INBOX));
-
- if (!inbox_pixbuf_open) {
- GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp");
- inbox_pixbuf_open = gdk_pixbuf_copy (inbox_pixbuf);
- gdk_pixbuf_composite (emblem, inbox_pixbuf_open, 0, 0,
- MIN (gdk_pixbuf_get_width (emblem),
- gdk_pixbuf_get_width (inbox_pixbuf_open)),
- MIN (gdk_pixbuf_get_height (emblem),
- gdk_pixbuf_get_height (inbox_pixbuf_open)),
- 0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
- g_object_unref (emblem);
- }
-
- if (!inbox_pixbuf_close) {
- GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp");
- inbox_pixbuf_close = gdk_pixbuf_copy (inbox_pixbuf);
- gdk_pixbuf_composite (emblem, inbox_pixbuf_close, 0, 0,
- MIN (gdk_pixbuf_get_width (emblem),
- gdk_pixbuf_get_width (inbox_pixbuf_close)),
- MIN (gdk_pixbuf_get_height (emblem),
- gdk_pixbuf_get_height (inbox_pixbuf_close)),
- 0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
- g_object_unref (emblem);
- }
-
-
- pixbuf = g_object_ref (inbox_pixbuf);
- pixbuf_open = g_object_ref (inbox_pixbuf_open);
- pixbuf_close = g_object_ref (inbox_pixbuf_close);
-
- break;
+ retval = get_composite_icons (MODEST_FOLDER_ICON_INBOX,
+ &inbox_pixbuf,
+ &inbox_pixbuf_open,
+ &inbox_pixbuf_close);
+ break;
case TNY_FOLDER_TYPE_OUTBOX:
- if (!outbox_pixbuf)
- outbox_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_OUTBOX));
-
- if (!outbox_pixbuf_open) {
- GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp");
- outbox_pixbuf_open = gdk_pixbuf_copy (outbox_pixbuf);
- gdk_pixbuf_composite (emblem, outbox_pixbuf_open, 0, 0,
- MIN (gdk_pixbuf_get_width (emblem),
- gdk_pixbuf_get_width (outbox_pixbuf_open)),
- MIN (gdk_pixbuf_get_height (emblem),
- gdk_pixbuf_get_height (outbox_pixbuf_open)),
- 0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
- g_object_unref (emblem);
- }
-
- if (!outbox_pixbuf_close) {
- GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp");
- outbox_pixbuf_close = gdk_pixbuf_copy (outbox_pixbuf);
- gdk_pixbuf_composite (emblem, outbox_pixbuf_close, 0, 0,
- MIN (gdk_pixbuf_get_width (emblem),
- gdk_pixbuf_get_width (outbox_pixbuf_close)),
- MIN (gdk_pixbuf_get_height (emblem),
- gdk_pixbuf_get_height (outbox_pixbuf_close)),
- 0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
- g_object_unref (emblem);
- }
-
-
- pixbuf = g_object_ref (outbox_pixbuf);
- pixbuf_open = g_object_ref (outbox_pixbuf_open);
- pixbuf_close = g_object_ref (outbox_pixbuf_close);
-
- break;
+ retval = get_composite_icons (MODEST_FOLDER_ICON_OUTBOX,
+ &outbox_pixbuf,
+ &outbox_pixbuf_open,
+ &outbox_pixbuf_close);
+ break;
case TNY_FOLDER_TYPE_JUNK:
- if (!junk_pixbuf)
- junk_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_JUNK));
-
- if (!junk_pixbuf_open) {
- GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp");
- junk_pixbuf_open = gdk_pixbuf_copy (junk_pixbuf);
- gdk_pixbuf_composite (emblem, junk_pixbuf_open, 0, 0,
- MIN (gdk_pixbuf_get_width (emblem),
- gdk_pixbuf_get_width (junk_pixbuf_open)),
- MIN (gdk_pixbuf_get_height (emblem),
- gdk_pixbuf_get_height (junk_pixbuf_open)),
- 0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
- g_object_unref (emblem);
- }
-
- if (!junk_pixbuf_close) {
- GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp");
- junk_pixbuf_close = gdk_pixbuf_copy (junk_pixbuf);
- gdk_pixbuf_composite (emblem, junk_pixbuf_close, 0, 0,
- MIN (gdk_pixbuf_get_width (emblem),
- gdk_pixbuf_get_width (junk_pixbuf_close)),
- MIN (gdk_pixbuf_get_height (emblem),
- gdk_pixbuf_get_height (junk_pixbuf_close)),
- 0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
- g_object_unref (emblem);
- }
-
-
- pixbuf = g_object_ref (junk_pixbuf);
- pixbuf_open = g_object_ref (junk_pixbuf_open);
- pixbuf_close = g_object_ref (junk_pixbuf_close);
-
- break;
+ retval = get_composite_icons (MODEST_FOLDER_ICON_JUNK,
+ &junk_pixbuf,
+ &junk_pixbuf_open,
+ &junk_pixbuf_close);
+ break;
case TNY_FOLDER_TYPE_SENT:
- if (!sent_pixbuf)
- sent_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_SENT));
-
- if (!sent_pixbuf_open) {
- GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp");
- sent_pixbuf_open = gdk_pixbuf_copy (sent_pixbuf);
- gdk_pixbuf_composite (emblem, sent_pixbuf_open, 0, 0,
- MIN (gdk_pixbuf_get_width (emblem),
- gdk_pixbuf_get_width (sent_pixbuf_open)),
- MIN (gdk_pixbuf_get_height (emblem),
- gdk_pixbuf_get_height (sent_pixbuf_open)),
- 0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
- g_object_unref (emblem);
- }
-
- if (!sent_pixbuf_close) {
- GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp");
- sent_pixbuf_close = gdk_pixbuf_copy (sent_pixbuf);
- gdk_pixbuf_composite (emblem, sent_pixbuf_close, 0, 0,
- MIN (gdk_pixbuf_get_width (emblem),
- gdk_pixbuf_get_width (sent_pixbuf_close)),
- MIN (gdk_pixbuf_get_height (emblem),
- gdk_pixbuf_get_height (sent_pixbuf_close)),
- 0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
- g_object_unref (emblem);
- }
-
-
- pixbuf = g_object_ref (sent_pixbuf);
- pixbuf_open = g_object_ref (sent_pixbuf_open);
- pixbuf_close = g_object_ref (sent_pixbuf_close);
-
- break;
+ retval = get_composite_icons (MODEST_FOLDER_ICON_SENT,
+ &sent_pixbuf,
+ &sent_pixbuf_open,
+ &sent_pixbuf_close);
+ break;
case TNY_FOLDER_TYPE_TRASH:
- if (!trash_pixbuf)
- trash_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_TRASH));
-
- if (!trash_pixbuf_open) {
- GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp");
- trash_pixbuf_open = gdk_pixbuf_copy (trash_pixbuf);
- gdk_pixbuf_composite (emblem, trash_pixbuf_open, 0, 0,
- MIN (gdk_pixbuf_get_width (emblem),
- gdk_pixbuf_get_width (trash_pixbuf_open)),
- MIN (gdk_pixbuf_get_height (emblem),
- gdk_pixbuf_get_height (trash_pixbuf_open)),
- 0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
- g_object_unref (emblem);
- }
-
- if (!trash_pixbuf_close) {
- GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp");
- trash_pixbuf_close = gdk_pixbuf_copy (trash_pixbuf);
- gdk_pixbuf_composite (emblem, trash_pixbuf_close, 0, 0,
- MIN (gdk_pixbuf_get_width (emblem),
- gdk_pixbuf_get_width (trash_pixbuf_close)),
- MIN (gdk_pixbuf_get_height (emblem),
- gdk_pixbuf_get_height (trash_pixbuf_close)),
- 0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
- g_object_unref (emblem);
- }
-
-
- pixbuf = g_object_ref (trash_pixbuf);
- pixbuf_open = g_object_ref (trash_pixbuf_open);
- pixbuf_close = g_object_ref (trash_pixbuf_close);
-
- break;
+ retval = get_composite_icons (MODEST_FOLDER_ICON_TRASH,
+ &trash_pixbuf,
+ &trash_pixbuf_open,
+ &trash_pixbuf_close);
+ break;
case TNY_FOLDER_TYPE_DRAFTS:
- if (!draft_pixbuf)
- draft_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_DRAFTS));
-
- if (!draft_pixbuf_open) {
- GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp");
- draft_pixbuf_open = gdk_pixbuf_copy (draft_pixbuf);
- gdk_pixbuf_composite (emblem, draft_pixbuf_open, 0, 0,
- MIN (gdk_pixbuf_get_width (emblem),
- gdk_pixbuf_get_width (draft_pixbuf_open)),
- MIN (gdk_pixbuf_get_height (emblem),
- gdk_pixbuf_get_height (draft_pixbuf_open)),
- 0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
- g_object_unref (emblem);
- }
-
- if (!draft_pixbuf_close) {
- GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp");
- draft_pixbuf_close = gdk_pixbuf_copy (draft_pixbuf);
- gdk_pixbuf_composite (emblem, draft_pixbuf_close, 0, 0,
- MIN (gdk_pixbuf_get_width (emblem),
- gdk_pixbuf_get_width (draft_pixbuf_close)),
- MIN (gdk_pixbuf_get_height (emblem),
- gdk_pixbuf_get_height (draft_pixbuf_close)),
- 0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
- g_object_unref (emblem);
- }
-
-
- pixbuf = g_object_ref (draft_pixbuf);
- pixbuf_open = g_object_ref (draft_pixbuf_open);
- pixbuf_close = g_object_ref (draft_pixbuf_close);
-
- break;
+ retval = get_composite_icons (MODEST_FOLDER_ICON_DRAFTS,
+ &draft_pixbuf,
+ &draft_pixbuf_open,
+ &draft_pixbuf_close);
+ break;
case TNY_FOLDER_TYPE_NORMAL:
default:
- if (!normal_pixbuf)
- normal_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_NORMAL));
-
- if (!normal_pixbuf_open) {
- GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp");
- normal_pixbuf_open = gdk_pixbuf_copy (normal_pixbuf);
- gdk_pixbuf_composite (emblem, draft_pixbuf_open, 0, 0,
- MIN (gdk_pixbuf_get_width (emblem),
- gdk_pixbuf_get_width (normal_pixbuf_open)),
- MIN (gdk_pixbuf_get_height (emblem),
- gdk_pixbuf_get_height (normal_pixbuf_open)),
- 0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
- g_object_unref (emblem);
- }
-
- if (!normal_pixbuf_close) {
- GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp");
- normal_pixbuf_close = gdk_pixbuf_copy (normal_pixbuf);
- gdk_pixbuf_composite (emblem, normal_pixbuf_close, 0, 0,
- MIN (gdk_pixbuf_get_width (emblem),
- gdk_pixbuf_get_width (normal_pixbuf_close)),
- MIN (gdk_pixbuf_get_height (emblem),
- gdk_pixbuf_get_height (normal_pixbuf_close)),
- 0, 0, 1, 1, GDK_INTERP_NEAREST, 255);
- g_object_unref (emblem);
- }
-
-
- pixbuf = g_object_ref (normal_pixbuf);
- pixbuf_open = g_object_ref (normal_pixbuf_open);
- pixbuf_close = g_object_ref (normal_pixbuf_close);
-
- break;
-
+ retval = get_composite_icons (MODEST_FOLDER_ICON_NORMAL,
+ &normal_pixbuf,
+ &normal_pixbuf_open,
+ &normal_pixbuf_close);
+ break;
}
- retval->pixbuf = pixbuf;
- retval->pixbuf_open = pixbuf_open;
- retval->pixbuf_close = pixbuf_close;
-
return retval;
}
-
static void
free_pixbufs (ThreePixbufs *pixbufs)
{
- g_object_unref (pixbufs->pixbuf);
- g_object_unref (pixbufs->pixbuf_open);
- g_object_unref (pixbufs->pixbuf_close);
+ if (pixbufs->pixbuf)
+ g_object_unref (pixbufs->pixbuf);
+ if (pixbufs->pixbuf_open)
+ g_object_unref (pixbufs->pixbuf_open);
+ if (pixbufs->pixbuf_close)
+ g_object_unref (pixbufs->pixbuf_close);
g_slice_free (ThreePixbufs, pixbufs);
}
static void
-icon_cell_data (GtkTreeViewColumn *column,
+icon_cell_data (GtkTreeViewColumn *column,
GtkCellRenderer *renderer,
- GtkTreeModel *tree_model,
- GtkTreeIter *iter,
+ GtkTreeModel *tree_model,
+ GtkTreeIter *iter,
gpointer data)
{
GObject *rendobj = NULL, *instance = NULL;
TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance,
-1);
- if (!instance)
+ if (!instance)
return;
has_children = gtk_tree_model_iter_has_child (tree_model, iter);
- pixbufs = get_folder_icons (type, instance);
+ pixbufs = get_folder_icons (type, instance);
g_object_unref (instance);
/* Set pixbuf */
}
free_pixbufs (pixbufs);
-
- return;
}
static void
GtkTreeSelection *sel;
/* Create column */
- column = gtk_tree_view_column_new ();
-
+ column = gtk_tree_view_column_new ();
+
/* Set icon and text render function */
renderer = gtk_cell_renderer_pixbuf_new();
gtk_tree_view_column_pack_start (column, renderer, FALSE);
gtk_tree_view_column_set_cell_data_func(column, renderer,
icon_cell_data, treeview, NULL);
-
+
renderer = gtk_cell_renderer_text_new();
- g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END,
+ g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_END,
"ellipsize-set", TRUE, NULL);
gtk_tree_view_column_pack_start (column, renderer, TRUE);
gtk_tree_view_column_set_cell_data_func(column, renderer,
text_cell_data, treeview, NULL);
-
+
/* Set selection mode */
sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(treeview));
gtk_tree_selection_set_mode (sel, GTK_SELECTION_SINGLE);
/* Set treeview appearance */
gtk_tree_view_column_set_spacing (column, 2);
gtk_tree_view_column_set_resizable (column, TRUE);
- gtk_tree_view_column_set_fixed_width (column, TRUE);
+ gtk_tree_view_column_set_fixed_width (column, TRUE);
gtk_tree_view_set_headers_clickable (GTK_TREE_VIEW(treeview), FALSE);
gtk_tree_view_set_enable_search (GTK_TREE_VIEW(treeview), FALSE);
{
ModestFolderViewPrivate *priv;
ModestConf *conf;
-
+
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(obj);
-
+
priv->timer_expander = 0;
priv->account_store = NULL;
priv->query = NULL;
setup_drag_and_drop (GTK_TREE_VIEW(obj));
/* Connect signals */
- g_signal_connect (G_OBJECT (obj),
- "key-press-event",
+ g_signal_connect (G_OBJECT (obj),
+ "key-press-event",
G_CALLBACK (on_key_pressed), NULL);
- priv->display_name_changed_signal =
+ priv->display_name_changed_signal =
g_signal_connect (modest_runtime_get_account_mgr (),
"display_name_changed",
G_CALLBACK (on_display_name_changed),
* Track changes in the local account name (in the device it
* will be the device name)
*/
- priv->conf_key_signal = g_signal_connect (G_OBJECT(conf),
+ priv->conf_key_signal = g_signal_connect (G_OBJECT(conf),
"key_changed",
- G_CALLBACK(on_configuration_key_changed),
+ G_CALLBACK(on_configuration_key_changed),
obj);
}
{
TnyAccountStoreViewIface *klass = (TnyAccountStoreViewIface *)g;
- klass->set_account_store_func = modest_folder_view_set_account_store;
-
- return;
+ klass->set_account_store = modest_folder_view_set_account_store;
}
static void
{
ModestFolderViewPrivate *priv;
GtkTreeSelection *sel;
-
+
g_return_if_fail (obj);
-
+
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(obj);
if (priv->timer_expander != 0) {
priv->query = NULL;
}
-/* modest_folder_view_disable_next_folder_selection (MODEST_FOLDER_VIEW(obj)); */
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);
g_free (priv->local_account_name);
g_free (priv->visible_account_id);
-
+
if (priv->conf_key_signal) {
g_signal_handler_disconnect (modest_runtime_get_conf (),
priv->conf_key_signal);
}
if (priv->cur_folder_store) {
- if (TNY_IS_FOLDER(priv->cur_folder_store))
- 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;
}
priv->account_inserted_signal))
g_signal_handler_disconnect (G_OBJECT (priv->account_store),
priv->account_inserted_signal);
- if (g_signal_handler_is_connected (G_OBJECT (priv->account_store),
+ if (g_signal_handler_is_connected (G_OBJECT (priv->account_store),
priv->account_removed_signal))
- g_signal_handler_disconnect (G_OBJECT (priv->account_store),
+ g_signal_handler_disconnect (G_OBJECT (priv->account_store),
priv->account_removed_signal);
- if (g_signal_handler_is_connected (G_OBJECT (priv->account_store),
+ if (g_signal_handler_is_connected (G_OBJECT (priv->account_store),
priv->account_changed_signal))
- g_signal_handler_disconnect (G_OBJECT (priv->account_store),
+ g_signal_handler_disconnect (G_OBJECT (priv->account_store),
priv->account_changed_signal);
g_object_unref (G_OBJECT (priv->account_store));
}
priv->account_store = g_object_ref (G_OBJECT (account_store));
- priv->account_removed_signal =
+ priv->account_removed_signal =
g_signal_connect (G_OBJECT(account_store), "account_removed",
G_CALLBACK (on_account_removed), self);
G_CALLBACK (on_account_changed), self);
modest_folder_view_update_model (MODEST_FOLDER_VIEW (self), account_store);
-
- g_object_unref (G_OBJECT (device));
-}
-
-static void
-on_connection_status_changed (TnyAccount *self,
- TnyConnectionStatus status,
- gpointer user_data)
-{
- /* If the account becomes online then refresh it */
- if (status == TNY_CONNECTION_STATUS_CONNECTED) {
- const gchar *acc_name;
- GtkWidget *my_window;
+ priv->reselect = FALSE;
+ modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (self));
- my_window = gtk_widget_get_ancestor (GTK_WIDGET (user_data), MODEST_TYPE_WINDOW);
- acc_name = modest_tny_account_get_parent_modest_account_name_for_server_account (self);
- modest_ui_actions_do_send_receive (acc_name, MODEST_WINDOW (my_window));
- }
+ g_object_unref (G_OBJECT (device));
}
static void
-on_account_inserted (TnyAccountStore *account_store,
+on_account_inserted (TnyAccountStore *account_store,
TnyAccount *account,
gpointer user_data)
{
priv = MODEST_FOLDER_VIEW_GET_PRIVATE (user_data);
+
/* If we're adding a new account, and there is no previous
one, we need to select the visible server account */
if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE &&
!priv->visible_account_id)
- modest_widget_memory_restore (modest_runtime_get_conf(),
+ modest_widget_memory_restore (modest_runtime_get_conf(),
G_OBJECT (user_data),
MODEST_CONF_FOLDER_VIEW_KEY);
+ if (!GTK_IS_TREE_VIEW(user_data)) {
+ g_warning ("BUG: %s: not a valid tree view", __FUNCTION__);
+ return;
+ }
+
/* Get the inner model */
+ /* check, is some rare cases, we did not get the right thing here,
+ * NB#84097 */
filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (user_data));
+ if (!GTK_IS_TREE_MODEL_FILTER(filter_model)) {
+ g_warning ("BUG: %s: not a valid filter model", __FUNCTION__);
+ return;
+ }
+
+ /* check, is some rare cases, we did not get the right thing here,
+ * NB#84097 */
sort_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model));
+ if (!GTK_IS_TREE_MODEL_SORT(sort_model)) {
+ g_warning ("BUG: %s: not a valid sort model", __FUNCTION__);
+ return;
+ }
/* Insert the account in the model */
tny_list_append (TNY_LIST (gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sort_model))),
G_OBJECT (account));
-
- /* When the store account gets online refresh it */
- g_signal_connect (account, "connection_status_changed",
- G_CALLBACK (on_connection_status_changed),
- MODEST_FOLDER_VIEW (user_data));
-
/* Refilter the model */
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model));
}
+static gboolean
+same_account_selected (ModestFolderView *self,
+ TnyAccount *account)
+{
+ ModestFolderViewPrivate *priv;
+ gboolean same_account = FALSE;
+
+ priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
+
+ if (priv->cur_folder_store) {
+ TnyAccount *selected_folder_account = NULL;
+
+ if (TNY_IS_FOLDER (priv->cur_folder_store)) {
+ selected_folder_account =
+ modest_tny_folder_get_account (TNY_FOLDER (priv->cur_folder_store));
+ } else {
+ selected_folder_account =
+ TNY_ACCOUNT (g_object_ref (priv->cur_folder_store));
+ }
+
+ if (selected_folder_account == account)
+ same_account = TRUE;
+
+ g_object_unref (selected_folder_account);
+ }
+ return same_account;
+}
+
+/**
+ *
+ * Selects the first inbox or the local account in an idle
+ */
+static gboolean
+on_idle_select_first_inbox_or_local (gpointer user_data)
+{
+ ModestFolderView *self = MODEST_FOLDER_VIEW (user_data);
+
+ gdk_threads_enter ();
+ modest_folder_view_select_first_inbox_or_local (self);
+ gdk_threads_leave ();
+
+ return FALSE;
+}
+
static void
-on_account_changed (TnyAccountStore *account_store,
+on_account_changed (TnyAccountStore *account_store,
TnyAccount *tny_account,
gpointer user_data)
{
+ ModestFolderView *self;
ModestFolderViewPrivate *priv;
GtkTreeModel *sort_model, *filter_model;
+ GtkTreeSelection *sel;
+ gboolean same_account;
/* Ignore transport account insertions, we're not showing them
in the folder view */
if (TNY_IS_TRANSPORT_ACCOUNT (tny_account))
return;
+ if (!MODEST_IS_FOLDER_VIEW(user_data)) {
+ g_warning ("BUG: %s: not a valid folder view", __FUNCTION__);
+ return;
+ }
+
+ self = MODEST_FOLDER_VIEW (user_data);
priv = MODEST_FOLDER_VIEW_GET_PRIVATE (user_data);
/* Get the inner model */
filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (user_data));
+ if (!GTK_IS_TREE_MODEL_FILTER(filter_model)) {
+ g_warning ("BUG: %s: not a valid filter model", __FUNCTION__);
+ return;
+ }
+
sort_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model));
+ if (!GTK_IS_TREE_MODEL_SORT(sort_model)) {
+ g_warning ("BUG: %s: not a valid sort model", __FUNCTION__);
+ return;
+ }
+
+ /* Invalidate the cur_folder_store only if the selected folder
+ belongs to the account that is being removed */
+ same_account = same_account_selected (self, tny_account);
+ if (same_account) {
+ sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
+ gtk_tree_selection_unselect_all (sel);
+ }
/* Remove the account from the model */
tny_list_remove (TNY_LIST (gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sort_model))),
/* Refilter the model */
gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model));
-}
-
-/**
- *
- * Selects the first inbox or the local account in an idle
- */
-static gboolean
-on_idle_select_first_inbox_or_local (gpointer user_data)
-{
- ModestFolderView *self = MODEST_FOLDER_VIEW (user_data);
-
- modest_folder_view_select_first_inbox_or_local (self);
- return FALSE;
+ /* Select the first INBOX if the currently selected folder
+ belongs to the account that is being deleted */
+ if (same_account && !MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (tny_account))
+ g_idle_add (on_idle_select_first_inbox_or_local, self);
}
-
static void
-on_account_removed (TnyAccountStore *account_store,
+on_account_removed (TnyAccountStore *account_store,
TnyAccount *account,
gpointer user_data)
{
ModestFolderViewPrivate *priv;
GtkTreeModel *sort_model, *filter_model;
GtkTreeSelection *sel = NULL;
- gboolean same_account_selected = FALSE;
+ gboolean same_account = FALSE;
/* Ignore transport account removals, we're not showing them
in the folder view */
if (TNY_IS_TRANSPORT_ACCOUNT (account))
return;
+ if (!MODEST_IS_FOLDER_VIEW(user_data)) {
+ g_warning ("BUG: %s: not a valid folder view", __FUNCTION__);
+ return;
+ }
+
self = MODEST_FOLDER_VIEW (user_data);
priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
/* Invalidate the cur_folder_store only if the selected folder
belongs to the account that is being removed */
- if (priv->cur_folder_store) {
- TnyAccount *selected_folder_account = NULL;
-
- if (TNY_IS_FOLDER (priv->cur_folder_store)) {
- selected_folder_account =
- tny_folder_get_account (TNY_FOLDER (priv->cur_folder_store));
- } else {
- selected_folder_account =
- TNY_ACCOUNT (g_object_ref (priv->cur_folder_store));
- }
-
- if (selected_folder_account == account) {
- sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
- gtk_tree_selection_unselect_all (sel);
- same_account_selected = TRUE;
- }
- g_object_unref (selected_folder_account);
+ same_account = same_account_selected (self, account);
+ if (same_account) {
+ sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
+ gtk_tree_selection_unselect_all (sel);
}
/* Invalidate row to select only if the folder to select
/* Remove the account from the model */
filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
+ if (!GTK_IS_TREE_MODEL_FILTER(filter_model)) {
+ g_warning ("BUG: %s: not a valid filter model", __FUNCTION__);
+ return;
+ }
+
sort_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model));
+ if (!GTK_IS_TREE_MODEL_SORT(sort_model)) {
+ g_warning ("BUG: %s: not a valid sort model", __FUNCTION__);
+ return;
+ }
+
tny_list_remove (TNY_LIST (gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (sort_model))),
G_OBJECT (account));
/* Select the first INBOX if the currently selected folder
belongs to the account that is being deleted */
- if (same_account_selected)
+ if (same_account)
g_idle_add (on_idle_select_first_inbox_or_local, self);
}
modest_folder_view_set_title (ModestFolderView *self, const gchar *title)
{
GtkTreeViewColumn *col;
-
- g_return_if_fail (self);
+
+ g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
col = gtk_tree_view_get_column (GTK_TREE_VIEW(self), 0);
if (!col) {
}
static gboolean
-modest_folder_view_on_map (ModestFolderView *self,
+modest_folder_view_on_map (ModestFolderView *self,
GdkEventExpose *event,
gpointer data)
{
}
if (priv->reexpand) {
- expand_root_items (self);
+ expand_root_items (self);
priv->reexpand = FALSE;
}
GObject *self;
ModestFolderViewPrivate *priv;
GtkTreeSelection *sel;
-
+
self = G_OBJECT (g_object_new (MODEST_TYPE_FOLDER_VIEW, NULL));
priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
if (query)
priv->query = g_object_ref (query);
-
+
sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(self));
priv->changed_signal = g_signal_connect (sel, "changed",
G_CALLBACK (on_selection_changed), self);
gtk_tree_view_expand_row (GTK_TREE_VIEW(self), path, FALSE);
gtk_tree_path_next (path);
} while (gtk_tree_model_get_iter (model, &iter, path));
-
+
gtk_tree_path_free (path);
}
* MODEST_FOLDER_VIEW_STYLE_SHOW_ONE style. We only show the default
* account in this case, and the local folders.
*/
-static gboolean
-filter_row (GtkTreeModel *model,
- GtkTreeIter *iter,
- gpointer data)
+static gboolean
+filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
{
ModestFolderViewPrivate *priv;
gboolean retval = TRUE;
if (TNY_IS_ACCOUNT (instance)) {
TnyAccount *acc = TNY_ACCOUNT (instance);
const gchar *account_id = tny_account_get_id (acc);
-
- /* If it isn't a special folder,
+
+ /* If it isn't a special folder,
* don't show it unless it is the visible account: */
if (priv->style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE &&
!modest_tny_account_is_virtual_local_folders (acc) &&
strcmp (account_id, MODEST_MMC_ACCOUNT_ID)) {
-
+
/* Show only the visible account id */
if (priv->visible_account_id) {
if (strcmp (account_id, priv->visible_account_id))
retval = FALSE;
} else {
retval = FALSE;
- }
+ }
}
-
- /* Never show these to the user. They are merged into one folder
+
+ /* Never show these to the user. They are merged into one folder
* in the local-folders account instead: */
if (retval && MODEST_IS_TNY_OUTBOX_ACCOUNT (acc))
retval = FALSE;
}
/* Check hiding (if necessary) */
- cleared = modest_email_clipboard_cleared (priv->clipboard);
+ cleared = modest_email_clipboard_cleared (priv->clipboard);
if ((retval) && (!cleared) && (TNY_IS_FOLDER (instance))) {
id = tny_folder_get_id (TNY_FOLDER(instance));
if (priv->hidding_ids != NULL)
for (i=0; i < priv->n_selected && !found; i++)
if (priv->hidding_ids[i] != NULL && id != NULL)
found = (!strcmp (priv->hidding_ids[i], id));
-
+
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) {
type = modest_tny_folder_guess_folder_type(TNY_FOLDER(instance));
if (type == TNY_FOLDER_TYPE_INVALID)
g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
-
- if (type == TNY_FOLDER_TYPE_OUTBOX ||
+
+ if (type == TNY_FOLDER_TYPE_OUTBOX ||
type == TNY_FOLDER_TYPE_SENT
|| type == TNY_FOLDER_TYPE_DRAFTS)
retval = FALSE;
break;
}
}
-
+
/* Free */
g_object_unref (instance);
TnyAccountStore *account_store)
{
ModestFolderViewPrivate *priv;
- GtkTreeModel *model /* , *old_model */;
+ GtkTreeModel *model /* , *old_model */;
GtkTreeModel *filter_model = NULL, *sortable = NULL;
- g_return_val_if_fail (MODEST_IS_FOLDER_VIEW (self), FALSE);
- g_return_val_if_fail (account_store, FALSE);
+ g_return_val_if_fail (self && MODEST_IS_FOLDER_VIEW (self), FALSE);
+ g_return_val_if_fail (account_store && MODEST_IS_TNY_ACCOUNT_STORE(account_store),
+ FALSE);
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
-
+
/* Notify that there is no folder selected */
- g_signal_emit (G_OBJECT(self),
+ g_signal_emit (G_OBJECT(self),
signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
NULL, FALSE);
if (priv->cur_folder_store) {
/* FIXME: the local accounts are not shown when the query
selects only the subscribed folders */
- model = tny_gtk_folder_store_tree_model_new (NULL);
+ model = tny_gtk_folder_store_tree_model_new (NULL);
/* Get the accounts: */
tny_account_store_get_accounts (TNY_ACCOUNT_STORE(account_store),
sortable = gtk_tree_model_sort_new_with_model (model);
gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE(sortable),
- TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN,
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN,
GTK_SORT_ASCENDING);
gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (sortable),
TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN,
g_signal_connect (G_OBJECT(filter_model), "row-inserted",
(GCallback) on_row_inserted_maybe_select_folder, self);
-
g_object_unref (model);
- g_object_unref (filter_model);
+ g_object_unref (filter_model);
g_object_unref (sortable);
-
+
/* Force a reselection of the INBOX next time the widget is shown */
priv->reselect = TRUE;
-
+
return TRUE;
}
g_return_if_fail (sel);
g_return_if_fail (user_data);
-
+
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(user_data);
selected = gtk_tree_selection_get_selected (sel, &model, &iter);
- /* Notify the display name observers */
- g_signal_emit (G_OBJECT(user_data),
- signals[FOLDER_DISPLAY_NAME_CHANGED_SIGNAL], 0,
- NULL);
-
tree_view = MODEST_FOLDER_VIEW (user_data);
if (selected) {
return;
}
}
-
+
/* Current folder was unselected */
if (priv->cur_folder_store) {
- g_signal_emit (G_OBJECT(tree_view), signals[FOLDER_SELECTION_CHANGED_SIGNAL], 0,
- priv->cur_folder_store, FALSE);
-
+ /* We must do this firstly because a libtinymail-camel
+ implementation detail. If we issue the signal
+ before doing the sync_async, then that signal could
+ cause (and it actually does it) a free of the
+ summary of the folder (because the main window will
+ clear the headers view */
if (TNY_IS_FOLDER(priv->cur_folder_store))
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);
g_object_unref (priv->cur_folder_store);
priv->cur_folder_store = NULL;
{
ModestFolderViewPrivate *priv;
- g_return_val_if_fail (self, NULL);
-
+ g_return_val_if_fail (self && MODEST_IS_FOLDER_VIEW(self), NULL);
+
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
if (priv->cur_folder_store)
g_object_ref (priv->cur_folder_store);
{
/* Remote accounts -> Local account -> MMC account .*/
/* 0, 1, 2 */
-
- if (TNY_IS_ACCOUNT (folder) &&
+
+ if (TNY_IS_ACCOUNT (folder) &&
modest_tny_account_is_virtual_local_folders (
TNY_ACCOUNT (folder))) {
return 1;
goto finish;
if (type == TNY_FOLDER_TYPE_ROOT) {
- /* Compare the types, so that
+ /* Compare the types, so that
* Remote accounts -> Local account -> MMC account .*/
const gint pos1 = get_cmp_rows_type_pos (folder1);
const gint pos2 = get_cmp_rows_type_pos (folder2);
- /* printf ("DEBUG: %s:\n type1=%s, pos1=%d\n type2=%s, pos2=%d\n",
+ /* printf ("DEBUG: %s:\n type1=%s, pos1=%d\n type2=%s, pos2=%d\n",
__FUNCTION__, G_OBJECT_TYPE_NAME(folder1), pos1, G_OBJECT_TYPE_NAME(folder2), pos2); */
if (pos1 < pos2)
cmp = -1;
cmp = 1;
else {
/* Compare items of the same type: */
-
+
TnyAccount *account1 = NULL;
if (TNY_IS_ACCOUNT (folder1))
account1 = TNY_ACCOUNT (folder1);
-
+
TnyAccount *account2 = NULL;
if (TNY_IS_ACCOUNT (folder2))
account2 = TNY_ACCOUNT (folder2);
-
+
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) {
cmp = 0;
} else if (!account_id) {
if (has_parent) {
GObject *parent_folder;
TnyFolderType parent_type = TNY_FOLDER_TYPE_UNKNOWN;
- gtk_tree_model_get (tree_model, &parent,
+ gtk_tree_model_get (tree_model, &parent,
TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &parent_type,
TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &parent_folder,
-1);
if ((parent_type == TNY_FOLDER_TYPE_ROOT) &&
- TNY_IS_ACCOUNT (parent_folder) &&
- modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (parent_folder))) {
- cmp1 = get_cmp_subfolder_type_pos (modest_tny_folder_get_local_or_mmc_folder_type
- (TNY_FOLDER (folder1)));
- cmp2 = get_cmp_subfolder_type_pos (modest_tny_folder_get_local_or_mmc_folder_type
- (TNY_FOLDER (folder2)));
+ TNY_IS_ACCOUNT (parent_folder)) {
+ if (modest_tny_account_is_virtual_local_folders (TNY_ACCOUNT (parent_folder))) {
+ cmp1 = get_cmp_subfolder_type_pos (modest_tny_folder_get_local_or_mmc_folder_type
+ (TNY_FOLDER (folder1)));
+ cmp2 = get_cmp_subfolder_type_pos (modest_tny_folder_get_local_or_mmc_folder_type
+ (TNY_FOLDER (folder2)));
+ } else if (modest_tny_account_is_memory_card_account (TNY_ACCOUNT (parent_folder))) {
+ if (modest_local_folder_info_get_type (tny_folder_get_name (TNY_FOLDER (folder1))) == TNY_FOLDER_TYPE_ARCHIVE) {
+ cmp1 = 0;
+ cmp2 = 1;
+ } else if (modest_local_folder_info_get_type (tny_folder_get_name (TNY_FOLDER (folder2))) == TNY_FOLDER_TYPE_ARCHIVE) {
+ cmp1 = 1;
+ cmp2 = 0;
+ }
+ }
}
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)));
if (cmp1 == cmp2)
cmp = modest_text_utils_utf8_strcmp (name1, name2, TRUE);
- else
+ else
cmp = (cmp1 - cmp2);
}
-finish:
+finish:
if (folder1)
g_object_unref(G_OBJECT(folder1));
if (folder2)
g_free (name1);
g_free (name2);
- return cmp;
+ return cmp;
}
/*****************************************************************************/
* source for dnd after the event drop happened
*/
static void
-on_drag_data_get (GtkWidget *widget,
- GdkDragContext *context,
- GtkSelectionData *selection_data,
- guint info,
- guint time,
- gpointer data)
+on_drag_data_get (GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data,
+ guint info, guint time, gpointer data)
{
GtkTreeSelection *selection;
GtkTreeModel *model;
gtk_tree_set_row_drag_data (selection_data,
model,
source_row);
-
+
gtk_tree_path_free (source_row);
}
}
typedef struct _DndHelper {
+ ModestFolderView *folder_view;
gboolean delete_source;
GtkTreePath *source_row;
- GdkDragContext *context;
- guint time;
} DndHelper;
static void
g_slice_free (DndHelper, helper);
}
-/*
- * This function is the callback of the
- * modest_mail_operation_xfer_msgs () and
- * modest_mail_operation_xfer_folder() calls. We check here if the
- * message/folder was correctly asynchronously transferred. The reason
- * to use the same callback is that the code is the same, it only has
- * to check that the operation went fine and then finalize the drag
- * and drop action
- */
static void
-xfer_cb (ModestMailOperation *mail_op,
- gpointer user_data)
+xfer_folder_cb (ModestMailOperation *mail_op,
+ TnyFolder *new_folder,
+ gpointer user_data)
{
- gboolean success;
- DndHelper *helper;
-
- helper = (DndHelper *) user_data;
-
- if (modest_mail_operation_get_status (mail_op) ==
- MODEST_MAIL_OPERATION_STATUS_SUCCESS) {
- success = TRUE;
- } else {
- success = FALSE;
+ if (new_folder) {
+ /* Select the folder */
+ modest_folder_view_select_folder (MODEST_FOLDER_VIEW (user_data),
+ new_folder, FALSE);
}
-
- /* Notify the drag source. Never call delete, the monitor will
- do the job if needed */
- gtk_drag_finish (helper->context, success, FALSE, helper->time);
-
- /* Free the helper */
- dnd_helper_destroyer (helper);
}
+
/* get the folder for the row the treepath refers to. */
/* folder must be unref'd */
static TnyFolderStore *
{
GtkTreeIter iter;
TnyFolderStore *folder = NULL;
-
+
if (gtk_tree_model_get_iter (model,&iter, path))
gtk_tree_model_get (model, &iter,
TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder,
return folder;
}
+
/*
* This function is used by drag_data_received_cb to manage drag and
* drop of a header, i.e, and drag from the header view to the folder
drag_and_drop_from_header_view (GtkTreeModel *source_model,
GtkTreeModel *dest_model,
GtkTreePath *dest_row,
- GtkSelectionData *selection_data,
- DndHelper *helper)
+ GtkSelectionData *selection_data)
{
TnyList *headers = NULL;
- TnyFolder *folder = NULL;
+ TnyFolder *folder = NULL, *src_folder = NULL;
TnyFolderType folder_type;
- ModestMailOperation *mail_op = NULL;
GtkTreeIter source_iter, dest_iter;
ModestWindowMgr *mgr = NULL;
ModestWindow *main_win = NULL;
gchar **uris, **tmp;
- gint response;
/* Build the list of headers */
mgr = modest_runtime_get_window_mgr ();
while (*tmp != NULL) {
TnyHeader *header;
GtkTreePath *path;
+ gboolean first = TRUE;
/* Get header */
path = gtk_tree_path_new_from_string (*tmp);
gtk_tree_model_get_iter (source_model, &source_iter, path);
- gtk_tree_model_get (source_model, &source_iter,
- TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
+ gtk_tree_model_get (source_model, &source_iter,
+ TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN,
&header, -1);
/* Do not enable d&d of headers already opened */
if (!modest_window_mgr_find_registered_header(mgr, header, NULL))
tny_list_append (headers, G_OBJECT (header));
+ if (G_UNLIKELY (first)) {
+ src_folder = tny_header_get_folder (header);
+ first = FALSE;
+ }
+
/* Free and go on */
gtk_tree_path_free (path);
g_object_unref (header);
}
g_strfreev (uris);
+ /* This could happen ig we perform a d&d very quickly over the
+ same row that row could dissapear because message is
+ transferred */
+ if (!TNY_IS_FOLDER (src_folder))
+ goto cleanup;
+
/* Get the target folder */
gtk_tree_model_get_iter (dest_model, &dest_iter, dest_row);
- gtk_tree_model_get (dest_model, &dest_iter,
+ gtk_tree_model_get (dest_model, &dest_iter,
TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN,
&folder, -1);
-
+
if (!folder || !TNY_IS_FOLDER(folder)) {
/* g_warning ("%s: not a valid target folder (%p)", __FUNCTION__, folder); */
goto cleanup;
}
-
+
folder_type = modest_tny_folder_guess_folder_type (folder);
if (folder_type == TNY_FOLDER_TYPE_INVALID) {
/* g_warning ("%s: invalid target folder", __FUNCTION__); */
goto cleanup; /* cannot move messages there */
}
-
+
if (modest_tny_folder_get_rules((TNY_FOLDER(folder))) & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) {
/* g_warning ("folder not writable"); */
goto cleanup; /* verboten! */
}
-
+
/* Ask for confirmation to move */
main_win = modest_window_mgr_get_main_window (mgr, FALSE); /* don't create */
if (!main_win) {
goto cleanup;
}
- response = modest_ui_actions_msgs_move_to_confirmation (main_win, folder,
- TRUE, headers);
- if (response == GTK_RESPONSE_CANCEL)
- goto cleanup;
-
/* Transfer messages */
- mail_op = modest_mail_operation_new_with_error_handling ((GObject *) main_win,
- modest_ui_actions_move_folder_error_handler,
- NULL, NULL);
-
- modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
- mail_op);
+ modest_ui_actions_transfer_messages_helper (GTK_WINDOW (main_win), src_folder,
+ headers, folder);
- modest_mail_operation_xfer_msgs (mail_op,
- headers,
- folder,
- helper->delete_source,
- xfer_cb, helper);
-
/* Frees */
cleanup:
- if (G_IS_OBJECT(mail_op))
- g_object_unref (G_OBJECT (mail_op));
+ if (G_IS_OBJECT (src_folder))
+ g_object_unref (src_folder);
if (G_IS_OBJECT(folder))
g_object_unref (G_OBJECT (folder));
if (G_IS_OBJECT(headers))
typedef struct {
TnyFolderStore *src_folder;
TnyFolderStore *dst_folder;
- DndHelper *helper;
+ ModestFolderView *folder_view;
+ DndHelper *helper;
} DndFolderInfo;
static void
GtkWindow *parent_window,
TnyAccount *account)
{
- time_t dnd_time = info->helper->time;
- GdkDragContext *context = info->helper->context;
-
/* Show error */
modest_ui_actions_on_account_connection_error (parent_window, account);
/* Free the helper & info */
dnd_helper_destroyer (info->helper);
dnd_folder_info_destroyer (info);
-
- /* Notify the drag source. Never call delete, the monitor will
- do the job if needed */
- gtk_drag_finish (context, FALSE, FALSE, dnd_time);
- return;
}
static void
-drag_and_drop_from_folder_view_src_folder_performer (gboolean canceled,
+drag_and_drop_from_folder_view_src_folder_performer (gboolean canceled,
GError *err,
- GtkWindow *parent_window,
- TnyAccount *account,
+ GtkWindow *parent_window,
+ TnyAccount *account,
gpointer user_data)
{
DndFolderInfo *info = NULL;
TNY_FOLDER (info->src_folder),
info->dst_folder,
info->helper->delete_source,
- xfer_cb,
- info->helper);
-
+ xfer_folder_cb,
+ info->helper->folder_view);
+
+ /* Frees */
g_object_unref (G_OBJECT (mail_op));
+ dnd_helper_destroyer (info->helper);
+ dnd_folder_info_destroyer (info);
}
static void
-drag_and_drop_from_folder_view_dst_folder_performer (gboolean canceled,
+drag_and_drop_from_folder_view_dst_folder_performer (gboolean canceled,
GError *err,
- GtkWindow *parent_window,
- TnyAccount *account,
+ GtkWindow *parent_window,
+ TnyAccount *account,
gpointer user_data)
{
DndFolderInfo *info = NULL;
}
/* Connect to source folder and perform the copy/move */
- modest_platform_connect_and_perform_if_network_folderstore (NULL,
- info->src_folder,
- drag_and_drop_from_folder_view_src_folder_performer,
- info);
+ modest_platform_connect_if_remote_and_perform (NULL, TRUE,
+ info->src_folder,
+ drag_and_drop_from_folder_view_src_folder_performer,
+ info);
}
/*
win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), FALSE); /* don't create */
if (!win) {
g_warning ("%s: BUG: no main window", __FUNCTION__);
+ dnd_helper_destroyer (helper);
return;
}
-
+
if (!forbidden) {
/* check the folder rules for the destination */
folder = tree_path_to_folder (dest_model, dest_row);
forbidden = rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE;
} else if (TNY_IS_FOLDER_STORE(folder)) {
/* enable local root as destination for folders */
- if (!MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (folder)
- && TNY_IS_ACCOUNT (folder))
+ if (!MODEST_IS_TNY_LOCAL_FOLDERS_ACCOUNT (folder) &&
+ !modest_tny_account_is_memory_card_account (TNY_ACCOUNT (folder)))
forbidden = TRUE;
}
g_object_unref (folder);
g_object_unref (folder);
}
-
+
/* Check if the drag is possible */
if (forbidden || !gtk_tree_path_compare (helper->source_row, dest_row)) {
- gtk_drag_finish (helper->context, FALSE, FALSE, helper->time);
- gtk_tree_path_free (helper->source_row);
- g_slice_free (DndHelper, helper);
+ /* Show error */
+ modest_platform_run_information_dialog ((GtkWindow *) win,
+ _("mail_in_ui_folder_move_target_error"),
+ FALSE);
+ /* Restore the previous selection */
+ folder = tree_path_to_folder (source_model, helper->source_row);
+ if (folder) {
+ if (TNY_IS_FOLDER (folder))
+ modest_folder_view_select_folder (helper->folder_view,
+ TNY_FOLDER (folder), FALSE);
+ g_object_unref (folder);
+ }
+ dnd_helper_destroyer (helper);
return;
}
/* Get data */
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,
+ gtk_tree_model_get (dest_model, &dest_iter,
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN,
&dest_folder, -1);
gtk_tree_model_get_iter (source_model, &iter, helper->source_row);
gtk_tree_model_get (source_model, &iter,
&folder, -1);
/* Create the info for the performer */
- info = g_slice_new (DndFolderInfo);
+ info = g_slice_new0 (DndFolderInfo);
info->src_folder = g_object_ref (folder);
info->dst_folder = g_object_ref (dest_folder);
info->helper = helper;
/* Connect to the destination folder and perform the copy/move */
- modest_platform_connect_and_perform_if_network_folderstore (GTK_WINDOW (win),
- dest_folder,
- drag_and_drop_from_folder_view_dst_folder_performer,
- info);
-
+ modest_platform_connect_if_remote_and_perform (GTK_WINDOW (win), TRUE,
+ dest_folder,
+ drag_and_drop_from_folder_view_dst_folder_performer,
+ info);
+
/* Frees */
g_object_unref (dest_folder);
g_object_unref (folder);
* function will manage both the drags of folders of the treeview and
* drags of headers of the header view widget.
*/
-static void
-on_drag_data_received (GtkWidget *widget,
- GdkDragContext *context,
- gint x,
- gint y,
- GtkSelectionData *selection_data,
- guint target_type,
- guint time,
+static void
+on_drag_data_received (GtkWidget *widget,
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ GtkSelectionData *selection_data,
+ guint target_type,
+ guint time,
gpointer data)
{
GtkWidget *source_widget;
GtkTreeModel *dest_model, *source_model;
GtkTreePath *source_row, *dest_row;
GtkTreeViewDropPosition pos;
- gboolean success = FALSE, delete_source = FALSE;
- DndHelper *helper = NULL;
+ gboolean delete_source = FALSE;
+ gboolean success = FALSE;
/* Do not allow further process */
g_signal_stop_emission_by_name (widget, "drag-data-received");
/* Check if the get_data failed */
if (selection_data == NULL || selection_data->length < 0)
- gtk_drag_finish (context, success, FALSE, time);
+ goto end;
/* Select the destination model */
- dest_model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
+ dest_model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget));
/* Get the path to the destination row. Can not call
gtk_tree_view_get_drag_dest_row() because the source row
&dest_row, &pos);
/* Only allow drops IN other rows */
- if (!dest_row ||
- pos == GTK_TREE_VIEW_DROP_BEFORE ||
+ if (!dest_row ||
+ pos == GTK_TREE_VIEW_DROP_BEFORE ||
pos == GTK_TREE_VIEW_DROP_AFTER)
- gtk_drag_finish (context, success, FALSE, time);
-
- /* Create the helper */
- helper = g_slice_new0 (DndHelper);
- helper->delete_source = delete_source;
- helper->context = context;
- helper->time = time;
+ goto end;
+ success = TRUE;
/* Drags from the header view */
if (source_widget != widget) {
source_model = gtk_tree_view_get_model (GTK_TREE_VIEW (source_widget));
drag_and_drop_from_header_view (source_model,
dest_model,
dest_row,
- selection_data,
- helper);
+ selection_data);
} else {
+ DndHelper *helper = NULL;
+
/* Get the source model and row */
gtk_tree_get_row_drag_data (selection_data,
&source_model,
&source_row);
+
+ /* Create the helper */
+ helper = g_slice_new0 (DndHelper);
+ helper->delete_source = delete_source;
helper->source_row = gtk_tree_path_copy (source_row);
+ helper->folder_view = MODEST_FOLDER_VIEW (widget);
drag_and_drop_from_folder_view (source_model,
dest_model,
dest_row,
- selection_data,
+ selection_data,
helper);
gtk_tree_path_free (source_row);
/* Frees */
gtk_tree_path_free (dest_row);
+
+ end:
+ /* Finish the drag and drop */
+ gtk_drag_finish (context, success, FALSE, time);
}
/*
gint x,
gint y,
guint time,
- gpointer user_data)
+ gpointer user_data)
{
gpointer target;
GtkTreePath *dest_path = NULL;
GtkTreeViewDropPosition pos;
gboolean result = FALSE;
-
+
gdk_threads_enter ();
-
+
gtk_tree_view_get_drag_dest_row (tree_view,
&dest_path,
&pos);
-
+
if (dest_path &&
(pos == GTK_TREE_VIEW_DROP_INTO_OR_AFTER ||
pos == GTK_TREE_VIEW_DROP_INTO_OR_BEFORE)) {
else {
if (dest_path)
gtk_tree_path_free (dest_path);
-
+
result = TRUE;
}
-
+
gdk_threads_leave ();
return result;
gint x,
gint y,
guint time,
- gpointer user_data)
+ gpointer user_data)
{
GtkTreeViewDropPosition pos;
GtkTreePath *dest_row;
ModestFolderViewPrivate *priv;
GdkDragAction suggested_action;
gboolean valid_location = FALSE;
- TnyFolderStore *folder;
+ TnyFolderStore *folder = NULL;
priv = MODEST_FOLDER_VIEW_GET_PRIVATE (widget);
goto out;
}
}
- g_object_unref (folder);
/* Expand the selected row after 1/2 second */
if (!gtk_tree_view_row_expanded (GTK_TREE_VIEW (widget), dest_row)) {
- gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget), dest_row, pos);
priv->timer_expander = g_timeout_add (500, expand_row_timeout, widget);
}
+ gtk_tree_view_set_drag_dest_row (GTK_TREE_VIEW (widget), dest_row, pos);
/* Select the desired action. By default we pick MOVE */
suggested_action = GDK_ACTION_MOVE;
gdk_drag_status(context, GDK_ACTION_DEFAULT, time);
out:
- if (dest_row)
+ if (folder)
+ g_object_unref (folder);
+ if (dest_row) {
gtk_tree_path_free (dest_row);
+ }
g_signal_stop_emission_by_name (widget, "drag-motion");
return valid_location;
"drag_motion",
G_CALLBACK (on_drag_motion),
NULL);
-
+
g_signal_connect (G_OBJECT (self),
"drag_data_get",
G_CALLBACK (on_drag_data_get),
* tree view refresh. It's better to cache it and change whenever
* necessary.
*/
-static void
-on_configuration_key_changed (ModestConf* conf,
- const gchar *key,
+static void
+on_configuration_key_changed (ModestConf* conf,
+ const gchar *key,
ModestConfEvent event,
- ModestConfNotificationId id,
+ ModestConfNotificationId id,
ModestFolderView *self)
{
ModestFolderViewPrivate *priv;
#if GTK_CHECK_VERSION(2, 8, 0)
GtkTreeViewColumn * tree_column;
- tree_column = gtk_tree_view_get_column (GTK_TREE_VIEW (self),
+ tree_column = gtk_tree_view_get_column (GTK_TREE_VIEW (self),
TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN);
gtk_tree_view_column_queue_resize (tree_column);
#else
{
ModestFolderViewPrivate *priv;
- g_return_if_fail (self);
-
+ g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
+ g_return_if_fail (style == MODEST_FOLDER_VIEW_STYLE_SHOW_ALL ||
+ style == MODEST_FOLDER_VIEW_STYLE_SHOW_ONE);
+
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
+
priv->style = style;
}
ModestFolderViewPrivate *priv;
GtkTreeModel *model;
- g_return_if_fail (self);
-
+ g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
+
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
/* This will be used by the filter_row callback,
{
ModestFolderViewPrivate *priv;
- g_return_val_if_fail (self, NULL);
-
+ g_return_val_if_fail (self && MODEST_IS_FOLDER_VIEW(self), NULL);
+
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(self);
return (const gchar *) priv->visible_account_id;
GtkTreeIter child;
TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
- gtk_tree_model_get (model, iter,
- TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN,
+ gtk_tree_model_get (model, iter,
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN,
&type, -1);
-
+
gboolean result = FALSE;
if (type == TNY_FOLDER_TYPE_INBOX) {
result = TRUE;
- }
+ }
if (result) {
*inbox_iter = *iter;
return TRUE;
-void
+void
modest_folder_view_select_first_inbox_or_local (ModestFolderView *self)
{
GtkTreeModel *model;
GtkTreeSelection *sel;
GtkTreePath *path = NULL;
+ g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
+
model = gtk_tree_view_get_model (GTK_TREE_VIEW (self));
if (!model)
return;
/* recursive */
static gboolean
-find_folder_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *folder_iter,
+find_folder_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *folder_iter,
TnyFolder* folder)
{
do {
TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
TnyFolder* a_folder;
gchar *name = NULL;
-
- gtk_tree_model_get (model, iter,
+
+ 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);
+ TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
+ -1);
g_free (name);
if (folder == a_folder) {
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))
+ if (find_folder_iter (model, &child, folder_iter, folder))
return TRUE;
}
static void
-on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model, GtkTreePath *path, GtkTreeIter *iter,
+on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model,
+ GtkTreePath *path,
+ GtkTreeIter *iter,
ModestFolderView *self)
{
ModestFolderViewPrivate *priv = NULL;
if (!MODEST_IS_FOLDER_VIEW(self))
return;
-
+
priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
priv->reexpand = TRUE;
- gtk_tree_model_get (tree_model, iter,
+ gtk_tree_model_get (tree_model, iter,
TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance,
-1);
}
g_object_unref (instance);
-
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);
-
}
/* Disable next */
modest_folder_view_disable_next_folder_selection (self);
-/* g_object_unref (priv->folder_to_select); */
-/* priv->folder_to_select = NULL; */
+
+ /* Refilter the model */
+ gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (tree_model));
}
}
void
-modest_folder_view_disable_next_folder_selection (ModestFolderView *self)
+modest_folder_view_disable_next_folder_selection (ModestFolderView *self)
{
- ModestFolderViewPrivate *priv = NULL;
+ ModestFolderViewPrivate *priv;
+
+ g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
- g_return_if_fail (MODEST_IS_FOLDER_VIEW (self));
priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
if (priv->folder_to_select)
g_object_unref(priv->folder_to_select);
-
+
priv->folder_to_select = NULL;
}
gboolean
-modest_folder_view_select_folder (ModestFolderView *self, TnyFolder *folder,
+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);
-
+
+ g_return_val_if_fail (self && MODEST_IS_FOLDER_VIEW (self), FALSE);
+ g_return_val_if_fail (folder && TNY_IS_FOLDER (folder), FALSE);
+
priv = MODEST_FOLDER_VIEW_GET_PRIVATE (self);
if (after_change) {
-
sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
gtk_tree_selection_unselect_all (sel);
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;
+
+ /* Refilter the model, before selecting the folder */
+ gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (model));
+
if (!gtk_tree_model_get_iter_first (model, &iter)) {
g_warning ("%s: model is empty", __FUNCTION__);
return FALSE;
}
-
+
if (find_folder_iter (model, &iter, &folder_iter, folder)) {
GtkTreePath *path;
}
-void
-modest_folder_view_copy_selection (ModestFolderView *folder_view)
+void
+modest_folder_view_copy_selection (ModestFolderView *self)
{
+ g_return_if_fail (self && MODEST_IS_FOLDER_VIEW(self));
+
/* Copy selection */
- _clipboard_set_selected_data (folder_view, FALSE);
+ _clipboard_set_selected_data (self, FALSE);
}
-void
+void
modest_folder_view_cut_selection (ModestFolderView *folder_view)
{
ModestFolderViewPrivate *priv = NULL;
const gchar **hidding = NULL;
guint i, n_selected;
- g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view));
+ g_return_if_fail (folder_view && MODEST_IS_FOLDER_VIEW (folder_view));
priv = MODEST_FOLDER_VIEW_GET_PRIVATE (folder_view);
/* Copy selection */
return;
/* Get hidding ids */
- hidding = modest_email_clipboard_get_hidding_ids (priv->clipboard, &n_selected);
-
+ hidding = modest_email_clipboard_get_hidding_ids (priv->clipboard, &n_selected);
+
/* Clear hidding array created by previous cut operation */
_clear_hidding_filter (MODEST_FOLDER_VIEW (folder_view));
/* Copy hidding array */
priv->n_selected = n_selected;
priv->hidding_ids = g_malloc0(sizeof(gchar *) * n_selected);
- for (i=0; i < n_selected; i++)
- priv->hidding_ids[i] = g_strdup(hidding[i]);
+ for (i=0; i < n_selected; i++)
+ priv->hidding_ids[i] = g_strdup(hidding[i]);
/* Hide cut folders */
model = gtk_tree_view_get_model (GTK_TREE_VIEW (folder_view));
GtkTreeModel *filter_model = NULL;
GtkTreeModel *model = NULL;
GtkTreeModel *new_filter_model = NULL;
-
- g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view_src));
- g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view_dst));
+
+ g_return_if_fail (folder_view_src && MODEST_IS_FOLDER_VIEW (folder_view_src));
+ g_return_if_fail (folder_view_dst && MODEST_IS_FOLDER_VIEW (folder_view_dst));
/* Get src model*/
filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (folder_view_src));
model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER(filter_model));
/* Build new filter model */
- new_filter_model = gtk_tree_model_filter_new (model, NULL);
+ new_filter_model = gtk_tree_model_filter_new (model, NULL);
gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (new_filter_model),
filter_row,
folder_view_dst,
gboolean show)
{
GtkTreeModel *model = NULL;
- ModestFolderViewPrivate* priv = MODEST_FOLDER_VIEW_GET_PRIVATE(folder_view);
+ ModestFolderViewPrivate* priv;
+
+ g_return_if_fail (folder_view && MODEST_IS_FOLDER_VIEW (folder_view));
+
+ 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())); */
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_val_if_fail (MODEST_IS_EMAIL_CLIPBOARD (priv->clipboard), FALSE);
folder = modest_folder_view_get_selected (folder_view);
}
static void
-_clear_hidding_filter (ModestFolderView *folder_view)
+_clear_hidding_filter (ModestFolderView *folder_view)
{
ModestFolderViewPrivate *priv;
guint i;
-
- g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view));
+
+ g_return_if_fail (MODEST_IS_FOLDER_VIEW (folder_view));
priv = MODEST_FOLDER_VIEW_GET_PRIVATE(folder_view);
if (priv->hidding_ids != NULL) {
- for (i=0; i < priv->n_selected; i++)
+ for (i=0; i < priv->n_selected; i++)
g_free (priv->hidding_ids[i]);
g_free(priv->hidding_ids);
- }
+ }
}
-static void
-on_display_name_changed (ModestAccountMgr *mgr,
+static void
+on_display_name_changed (ModestAccountMgr *mgr,
const gchar *account,
gpointer user_data)
{
/* Force a redraw */
#if GTK_CHECK_VERSION(2, 8, 0)
GtkTreeViewColumn * tree_column;
-
- tree_column = gtk_tree_view_get_column (GTK_TREE_VIEW (self),
+
+ tree_column = gtk_tree_view_get_column (GTK_TREE_VIEW (self),
TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN);
gtk_tree_view_column_queue_resize (tree_column);
#else
projects / modest / blobdiff