X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-folder-view.c;h=fe5ab9cc991219e0c7f30408054dea0e391a16c2;hp=c104fdede657298f30a3a2f5357c20cff6548b79;hb=f13a2425f1f0f22fce4d2416b2cefe429fcce615;hpb=e035afa8aa0370950770a833d91184e71f43b9f9 diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c index c104fde..fe5ab9c 100644 --- a/src/widgets/modest-folder-view.c +++ b/src/widgets/modest-folder-view.c @@ -76,7 +76,8 @@ static void tny_account_store_view_init (gpointer g, static void modest_folder_view_set_account_store (TnyAccountStoreView *self, TnyAccountStore *account_store); -static void on_selection_changed (GtkTreeSelection *sel, gpointer data); +static void on_selection_changed (GtkTreeSelection *sel, + gpointer data); static void on_account_removed (TnyAccountStore *self, TnyAccount *account, @@ -240,7 +241,9 @@ static void 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; @@ -274,6 +277,9 @@ modest_folder_view_class_init (ModestFolderViewClass *klass) NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); + + treeview_class->select_cursor_parent = NULL; + } /* Simplify checks for NULLs: */ @@ -359,10 +365,10 @@ on_get_mmc_account_name (TnyStoreAccount* account, gpointer user_data) } 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; @@ -376,14 +382,8 @@ text_cell_data (GtkTreeViewColumn *column, 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); @@ -416,10 +416,16 @@ text_cell_data (GtkTreeViewColumn *column, /* 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; } @@ -476,9 +482,11 @@ text_cell_data (GtkTreeViewColumn *column, 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); } @@ -536,22 +544,25 @@ get_folder_icons (TnyFolderType type, GObject *instance) TNY_ACCOUNT (instance))) { if (!avirt_pixbuf) - avirt_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_LOCAL_FOLDERS)); - + avirt_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_LOCAL_FOLDERS, + MODEST_ICON_SIZE_SMALL)); + 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); + GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp", + MODEST_ICON_SIZE_SMALL); + 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"); + GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp", + MODEST_ICON_SIZE_SMALL); avirt_pixbuf_close = gdk_pixbuf_copy (avirt_pixbuf); gdk_pixbuf_composite (emblem, avirt_pixbuf_close, 0, 0, MIN (gdk_pixbuf_get_width (emblem), @@ -573,10 +584,12 @@ get_folder_icons (TnyFolderType type, GObject *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)); - + ammc_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_MMC, + MODEST_ICON_SIZE_SMALL)); + if (!ammc_pixbuf_open) { - GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp"); + GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp", + MODEST_ICON_SIZE_SMALL); ammc_pixbuf_open = gdk_pixbuf_copy (ammc_pixbuf); gdk_pixbuf_composite (emblem, ammc_pixbuf_open, 0, 0, MIN (gdk_pixbuf_get_width (emblem), @@ -588,7 +601,8 @@ get_folder_icons (TnyFolderType type, GObject *instance) } if (!ammc_pixbuf_close) { - GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp"); + GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp", + MODEST_ICON_SIZE_SMALL); ammc_pixbuf_close = gdk_pixbuf_copy (ammc_pixbuf); gdk_pixbuf_composite (emblem, ammc_pixbuf_close, 0, 0, MIN (gdk_pixbuf_get_width (emblem), @@ -607,10 +621,11 @@ get_folder_icons (TnyFolderType type, GObject *instance) } else { if (!anorm_pixbuf) - anorm_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_ACCOUNT)); - + anorm_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_ACCOUNT, + MODEST_ICON_SIZE_SMALL)); if (!anorm_pixbuf_open) { - GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp"); + GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp", + MODEST_ICON_SIZE_SMALL); anorm_pixbuf_open = gdk_pixbuf_copy (anorm_pixbuf); gdk_pixbuf_composite (emblem, anorm_pixbuf_open, 0, 0, MIN (gdk_pixbuf_get_width (emblem), @@ -622,7 +637,8 @@ get_folder_icons (TnyFolderType type, GObject *instance) } if (!anorm_pixbuf_close) { - GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp"); + GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp", + MODEST_ICON_SIZE_SMALL); anorm_pixbuf_close = gdk_pixbuf_copy (anorm_pixbuf); gdk_pixbuf_composite (emblem, anorm_pixbuf_close, 0, 0, MIN (gdk_pixbuf_get_width (emblem), @@ -645,56 +661,62 @@ get_folder_icons (TnyFolderType type, GObject *instance) case TNY_FOLDER_TYPE_INBOX: if (!inbox_pixbuf) - inbox_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_INBOX)); + inbox_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_INBOX, + MODEST_ICON_SIZE_SMALL)); 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); + GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp", + MODEST_ICON_SIZE_SMALL); + 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); + GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp", + MODEST_ICON_SIZE_SMALL); + 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; 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) + outbox_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_OUTBOX, + MODEST_ICON_SIZE_SMALL)); + + if (!outbox_pixbuf_open) { + GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp", + MODEST_ICON_SIZE_SMALL); + 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"); + GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp", + MODEST_ICON_SIZE_SMALL); outbox_pixbuf_close = gdk_pixbuf_copy (outbox_pixbuf); gdk_pixbuf_composite (emblem, outbox_pixbuf_close, 0, 0, MIN (gdk_pixbuf_get_width (emblem), @@ -713,101 +735,110 @@ get_folder_icons (TnyFolderType type, GObject *instance) break; case TNY_FOLDER_TYPE_JUNK: if (!junk_pixbuf) - junk_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_JUNK)); - + junk_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_JUNK, + MODEST_ICON_SIZE_SMALL)); 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); + GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp", + MODEST_ICON_SIZE_SMALL); + 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); + GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp", + MODEST_ICON_SIZE_SMALL); + 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; - 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); - } + case TNY_FOLDER_TYPE_SENT: + if (!sent_pixbuf) + sent_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_SENT, + MODEST_ICON_SIZE_SMALL)); + + if (!sent_pixbuf_open) { + GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp", + MODEST_ICON_SIZE_SMALL); + 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", + MODEST_ICON_SIZE_SMALL); + 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; + case TNY_FOLDER_TYPE_TRASH: if (!trash_pixbuf) - trash_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_TRASH)); - + trash_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_TRASH, + MODEST_ICON_SIZE_SMALL)); 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); + GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp", + MODEST_ICON_SIZE_SMALL); + 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); + GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp", + MODEST_ICON_SIZE_SMALL); + 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); @@ -815,10 +846,12 @@ get_folder_icons (TnyFolderType type, GObject *instance) break; case TNY_FOLDER_TYPE_DRAFTS: if (!draft_pixbuf) - draft_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_DRAFTS)); - + draft_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_DRAFTS, + MODEST_ICON_SIZE_SMALL)); + if (!draft_pixbuf_open) { - GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp"); + GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp", + MODEST_ICON_SIZE_SMALL); draft_pixbuf_open = gdk_pixbuf_copy (draft_pixbuf); gdk_pixbuf_composite (emblem, draft_pixbuf_open, 0, 0, MIN (gdk_pixbuf_get_width (emblem), @@ -830,7 +863,8 @@ get_folder_icons (TnyFolderType type, GObject *instance) } if (!draft_pixbuf_close) { - GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp"); + GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_clp", + MODEST_ICON_SIZE_SMALL); draft_pixbuf_close = gdk_pixbuf_copy (draft_pixbuf); gdk_pixbuf_composite (emblem, draft_pixbuf_close, 0, 0, MIN (gdk_pixbuf_get_width (emblem), @@ -849,34 +883,37 @@ get_folder_icons (TnyFolderType type, GObject *instance) 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); - } - - + if (!normal_pixbuf) + normal_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_NORMAL, + MODEST_ICON_SIZE_SMALL)); + + if (!normal_pixbuf_open) { + GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp", + MODEST_ICON_SIZE_SMALL); + normal_pixbuf_open = gdk_pixbuf_copy (normal_pixbuf); + gdk_pixbuf_composite (emblem, normal_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", + MODEST_ICON_SIZE_SMALL); + 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); @@ -1040,9 +1077,7 @@ tny_account_store_view_init (gpointer g, gpointer iface_data) { 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 @@ -1076,7 +1111,6 @@ modest_folder_view_finalize (GObject *obj) 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; @@ -1096,10 +1130,6 @@ modest_folder_view_finalize (GObject *obj) } if (priv->cur_folder_store) { - if (TNY_IS_FOLDER(priv->cur_folder_store)) - tny_folder_sync (TNY_FOLDER(priv->cur_folder_store), FALSE, NULL); - /* FALSE --> expunge the message */ - g_object_unref (priv->cur_folder_store); priv->cur_folder_store = NULL; } @@ -1155,27 +1185,13 @@ modest_folder_view_set_account_store (TnyAccountStoreView *self, TnyAccountStore G_CALLBACK (on_account_changed), self); modest_folder_view_update_model (MODEST_FOLDER_VIEW (self), account_store); + priv->reselect = FALSE; + modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (self)); 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; - - 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)); - } -} - -static void on_account_inserted (TnyAccountStore *account_store, TnyAccount *account, gpointer user_data) @@ -1190,6 +1206,7 @@ on_account_inserted (TnyAccountStore *account_store, 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 && @@ -1198,58 +1215,142 @@ on_account_inserted (TnyAccountStore *account_store, 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)); + + /* Refilter the model */ + gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model)); +} - /* 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)); +static gboolean +same_account_selected (ModestFolderView *self, + TnyAccount *account) +{ + ModestFolderViewPrivate *priv; + gboolean same_account = FALSE; - /* Refilter the model */ - gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model)); + 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 = + 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, TnyAccount *tny_account, gpointer user_data) { - /* do nothing */ + 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))), G_OBJECT (tny_account)); - + /* 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 (tny_account)); /* Refilter the model */ gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (filter_model)); -} - + /* Select the first INBOX if the currently selected folder + belongs to the account that is being deleted */ + if (same_account) + g_idle_add (on_idle_select_first_inbox_or_local, self); +} static void on_account_removed (TnyAccountStore *account_store, @@ -1260,35 +1361,27 @@ on_account_removed (TnyAccountStore *account_store, 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 @@ -1307,7 +1400,17 @@ on_account_removed (TnyAccountStore *account_store, /* 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)); @@ -1329,8 +1432,8 @@ on_account_removed (TnyAccountStore *account_store, /* Select the first INBOX if the currently selected folder belongs to the account that is being deleted */ - if (same_account_selected) - modest_folder_view_select_first_inbox_or_local (self); + if (same_account) + g_idle_add (on_idle_select_first_inbox_or_local, self); } void @@ -1338,7 +1441,7 @@ 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) { @@ -1434,9 +1537,7 @@ expand_root_items (ModestFolderView *self) * account in this case, and the local folders. */ static gboolean -filter_row (GtkTreeModel *model, - GtkTreeIter *iter, - gpointer data) +filter_row (GtkTreeModel *model, GtkTreeIter *iter, gpointer data) { ModestFolderViewPrivate *priv; gboolean retval = TRUE; @@ -1544,13 +1645,14 @@ modest_folder_view_update_model (ModestFolderView *self, 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) { @@ -1560,7 +1662,7 @@ modest_folder_view_update_model (ModestFolderView *self, /* 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), @@ -1587,7 +1689,6 @@ modest_folder_view_update_model (ModestFolderView *self, 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 (sortable); @@ -1616,11 +1717,6 @@ on_selection_changed (GtkTreeSelection *sel, gpointer 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) { @@ -1666,8 +1762,8 @@ TnyFolderStore * modest_folder_view_get_selected (ModestFolderView *self) { 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) @@ -1812,12 +1908,21 @@ cmp_rows (GtkTreeModel *tree_model, GtkTreeIter *iter1, GtkTreeIter *iter2, 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); } @@ -1855,18 +1960,14 @@ finish: * 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; GtkTreeIter iter; GtkTreePath *source_row; - + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (widget)); if (gtk_tree_selection_get_selected (selection, &model, &iter)) { @@ -1880,10 +1981,9 @@ on_drag_data_get (GtkWidget *widget, } typedef struct _DndHelper { + ModestFolderView *folder_view; gboolean delete_source; GtkTreePath *source_row; - GdkDragContext *context; - guint time; } DndHelper; static void @@ -1894,39 +1994,19 @@ dnd_helper_destroyer (DndHelper *helper) 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, TRUE); } - - /* 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 * @@ -1942,6 +2022,7 @@ tree_path_to_folder (GtkTreeModel *model, GtkTreePath *path) 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 @@ -1951,19 +2032,16 @@ static void 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 (); headers = tny_simple_list_new (); @@ -1973,6 +2051,7 @@ drag_and_drop_from_header_view (GtkTreeModel *source_model, while (*tmp != NULL) { TnyHeader *header; GtkTreePath *path; + gboolean first = TRUE; /* Get header */ path = gtk_tree_path_new_from_string (*tmp); @@ -1985,6 +2064,11 @@ drag_and_drop_from_header_view (GtkTreeModel *source_model, 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); @@ -2021,29 +2105,14 @@ drag_and_drop_from_header_view (GtkTreeModel *source_model, 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_mail_operation_xfer_msgs (mail_op, - headers, - folder, - helper->delete_source, - xfer_cb, helper); + modest_ui_actions_transfer_messages_helper (GTK_WINDOW (main_win), src_folder, + headers, folder); /* 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)) @@ -2053,6 +2122,7 @@ cleanup: typedef struct { TnyFolderStore *src_folder; TnyFolderStore *dst_folder; + ModestFolderView *folder_view; DndHelper *helper; } DndFolderInfo; @@ -2071,20 +2141,12 @@ dnd_on_connection_failed_destroyer (DndFolderInfo *info, 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 @@ -2117,10 +2179,13 @@ drag_and_drop_from_folder_view_src_folder_performer (gboolean canceled, 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); } @@ -2141,10 +2206,10 @@ drag_and_drop_from_folder_view_dst_folder_performer (gboolean canceled, } /* 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); } /* @@ -2169,6 +2234,7 @@ drag_and_drop_from_folder_view (GtkTreeModel *source_model, 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; } @@ -2181,8 +2247,8 @@ drag_and_drop_from_folder_view (GtkTreeModel *source_model, 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); @@ -2202,9 +2268,7 @@ drag_and_drop_from_folder_view (GtkTreeModel *source_model, /* 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); + dnd_helper_destroyer (helper); return; } @@ -2225,10 +2289,10 @@ drag_and_drop_from_folder_view (GtkTreeModel *source_model, 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); @@ -2255,8 +2319,8 @@ on_drag_data_received (GtkWidget *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"); @@ -2280,10 +2344,10 @@ on_drag_data_received (GtkWidget *widget, /* 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 @@ -2295,14 +2359,9 @@ on_drag_data_received (GtkWidget *widget, 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)); @@ -2310,14 +2369,20 @@ on_drag_data_received (GtkWidget *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, @@ -2330,6 +2395,10 @@ on_drag_data_received (GtkWidget *widget, /* Frees */ gtk_tree_path_free (dest_row); + + end: + /* Finish the drag and drop */ + gtk_drag_finish (context, success, FALSE, time); } /* @@ -2420,7 +2489,7 @@ on_drag_motion (GtkWidget *widget, ModestFolderViewPrivate *priv; GdkDragAction suggested_action; gboolean valid_location = FALSE; - TnyFolderStore *folder; + TnyFolderStore *folder = NULL; priv = MODEST_FOLDER_VIEW_GET_PRIVATE (widget); @@ -2457,13 +2526,12 @@ on_drag_motion (GtkWidget *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; @@ -2478,8 +2546,11 @@ on_drag_motion (GtkWidget *widget, 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; @@ -2615,10 +2686,13 @@ modest_folder_view_set_style (ModestFolderView *self, { 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; } @@ -2629,7 +2703,7 @@ modest_folder_view_set_account_id_of_visible_server_account (ModestFolderView *s 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); @@ -2657,7 +2731,7 @@ modest_folder_view_get_account_id_of_visible_server_account (ModestFolderView *s { 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); @@ -2705,6 +2779,8 @@ modest_folder_view_select_first_inbox_or_local (ModestFolderView *self) 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; @@ -2769,7 +2845,9 @@ find_folder_iter (GtkTreeModel *model, GtkTreeIter *iter, GtkTreeIter *folder_it 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; @@ -2792,7 +2870,6 @@ on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model, GtkTreePath *pat priv->folder_to_select = g_object_ref (instance); } g_object_unref (instance); - if (priv->folder_to_select) { @@ -2807,14 +2884,14 @@ on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model, GtkTreePath *pat gtk_tree_selection_select_iter (sel, iter); gtk_tree_view_set_cursor (GTK_TREE_VIEW(self), path, NULL, FALSE); - gtk_tree_path_free (path); - + 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)); } } @@ -2822,9 +2899,10 @@ on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model, GtkTreePath *pat void 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) @@ -2842,13 +2920,12 @@ modest_folder_view_select_folder (ModestFolderView *self, TnyFolder *folder, 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); @@ -2862,6 +2939,10 @@ modest_folder_view_select_folder (ModestFolderView *self, TnyFolder *folder, 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; @@ -2885,10 +2966,12 @@ modest_folder_view_select_folder (ModestFolderView *self, TnyFolder *folder, void -modest_folder_view_copy_selection (ModestFolderView *folder_view) +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 @@ -2899,7 +2982,7 @@ modest_folder_view_cut_selection (ModestFolderView *folder_view) 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 */ @@ -2931,9 +3014,9 @@ modest_folder_view_copy_model (ModestFolderView *folder_view_src, 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)); @@ -2958,7 +3041,11 @@ modest_folder_view_show_non_move_folders (ModestFolderView *folder_view, 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())); */