X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-folder-view.c;h=34ef4a2bc05be67b7676e657d566b911d5f14836;hp=0c513d99fb4b46019b3411526fc51734aa3d9d96;hb=d8f5c921672fdba55356fa8487762c75ef468c51;hpb=55c21e5ede8801f01fbec5617f5ecd56d1354d4f diff --git a/src/widgets/modest-folder-view.c b/src/widgets/modest-folder-view.c index 0c513d9..34ef4a2 100644 --- a/src/widgets/modest-folder-view.c +++ b/src/widgets/modest-folder-view.c @@ -377,7 +377,6 @@ 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; @@ -537,22 +536,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), @@ -574,10 +576,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), @@ -589,7 +593,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), @@ -608,10 +613,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), @@ -623,7 +629,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), @@ -646,56 +653,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), @@ -714,101 +727,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); @@ -816,10 +838,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), @@ -831,7 +855,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), @@ -850,34 +875,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, 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"); - 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); @@ -1041,9 +1069,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 @@ -1097,9 +1123,14 @@ 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 */ + if (TNY_IS_FOLDER(priv->cur_folder_store)) { + ModestMailOperation *mail_op; + + mail_op = modest_mail_operation_new (NULL); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); + modest_mail_operation_sync_folder (mail_op, TNY_FOLDER (priv->cur_folder_store), FALSE); + } g_object_unref (priv->cur_folder_store); priv->cur_folder_store = NULL; @@ -1172,7 +1203,7 @@ on_connection_status_changed (TnyAccount *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)); + modest_ui_actions_do_send_receive (acc_name, FALSE, MODEST_WINDOW (my_window)); } } @@ -1351,7 +1382,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) { @@ -1447,9 +1478,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; @@ -1557,9 +1586,10 @@ 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 */ @@ -1573,7 +1603,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), @@ -1629,11 +1659,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) { @@ -1679,8 +1704,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) @@ -1825,12 +1850,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); } @@ -1868,18 +1902,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)) { @@ -1893,6 +1923,7 @@ on_drag_data_get (GtkWidget *widget, } typedef struct _DndHelper { + ModestFolderView *folder_view; gboolean delete_source; GtkTreePath *source_row; GdkDragContext *context; @@ -1903,19 +1934,11 @@ static void dnd_helper_destroyer (DndHelper *helper) { /* Free the helper */ + g_object_unref (helper->folder_view); gtk_tree_path_free (helper->source_row); 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) @@ -1940,6 +1963,36 @@ xfer_cb (ModestMailOperation *mail_op, dnd_helper_destroyer (helper); } +static void +xfer_msgs_cb (ModestMailOperation *mail_op, + gpointer user_data) +{ + /* Common part */ + xfer_cb (mail_op, user_data); +} + +static void +xfer_folder_cb (ModestMailOperation *mail_op, + TnyFolder *new_folder, + gpointer user_data) +{ + DndHelper *helper; + GtkWidget *folder_view; + + helper = (DndHelper *) user_data; + folder_view = g_object_ref (helper->folder_view); + + /* Common part */ + xfer_cb (mail_op, user_data); + + /* Select the folder */ + if (new_folder) + modest_folder_view_select_folder (MODEST_FOLDER_VIEW (folder_view), + new_folder, FALSE); + g_object_unref (folder_view); +} + + /* get the folder for the row the treepath refers to. */ /* folder must be unref'd */ static TnyFolderStore * @@ -2051,7 +2104,7 @@ drag_and_drop_from_header_view (GtkTreeModel *source_model, headers, folder, helper->delete_source, - xfer_cb, helper); + xfer_msgs_cb, helper); /* Frees */ cleanup: @@ -2066,6 +2119,7 @@ cleanup: typedef struct { TnyFolderStore *src_folder; TnyFolderStore *dst_folder; + ModestFolderView *folder_view; DndHelper *helper; } DndFolderInfo; @@ -2076,6 +2130,8 @@ dnd_folder_info_destroyer (DndFolderInfo *info) g_object_unref (info->src_folder); if (info->dst_folder) g_object_unref (info->dst_folder); + if (info->folder_view) + g_object_unref (info->folder_view); g_slice_free (DndFolderInfo, info); } @@ -2130,9 +2186,12 @@ 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, + xfer_folder_cb, info->helper); +/* modest_folder_view_select_folder (MODEST_FOLDER_VIEW(info->folder_view), */ +/* TNY_FOLDER (info->dst_folder), TRUE); */ + g_object_unref (G_OBJECT (mail_op)); } @@ -2154,10 +2213,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); } /* @@ -2235,13 +2294,14 @@ drag_and_drop_from_folder_view (GtkTreeModel *source_model, info = g_slice_new (DndFolderInfo); info->src_folder = g_object_ref (folder); info->dst_folder = g_object_ref (dest_folder); + info->folder_view = g_object_ref (helper->folder_view); 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); @@ -2315,6 +2375,7 @@ on_drag_data_received (GtkWidget *widget, helper->delete_source = delete_source; helper->context = context; helper->time = time; + helper->folder_view = g_object_ref (widget); /* Drags from the header view */ if (source_widget != widget) { @@ -2629,10 +2690,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; } @@ -2643,7 +2707,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); @@ -2671,7 +2735,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); @@ -2719,6 +2783,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; @@ -2783,7 +2849,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; @@ -2827,8 +2895,9 @@ on_row_inserted_maybe_select_folder (GtkTreeModel *tree_model, GtkTreePath *pat /* 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)); } } @@ -2836,9 +2905,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) @@ -2856,13 +2926,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); @@ -2876,6 +2945,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; @@ -2899,10 +2972,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 @@ -2913,7 +2988,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 */ @@ -2945,9 +3020,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)); @@ -2972,7 +3047,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())); */