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,
TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type,
TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &instance,
-1);
-
if (!fname)
return;
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),
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),
}
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),
} 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),
}
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),
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),
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 (!junk_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));
-
- if (!junk_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);
+ 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",
+ 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);
break;
case TNY_FOLDER_TYPE_DRAFTS:
if (!draft_pixbuf)
- draft_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_DRAFTS));
-
- if (!junk_pixbuf_open) {
- GdkPixbuf *emblem = modest_platform_get_icon ("qgn_list_gene_fldr_exp");
+ 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",
+ 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),
}
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),
break;
case TNY_FOLDER_TYPE_NORMAL:
default:
- if (!normal_pixbuf)
- normal_pixbuf = gdk_pixbuf_copy (modest_platform_get_icon (MODEST_FOLDER_ICON_NORMAL));
-
- if (!junk_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);
}
static void
-icon_cell_data (GtkTreeViewColumn *column, GtkCellRenderer *renderer,
- GtkTreeModel *tree_model, GtkTreeIter *iter, gpointer data)
+icon_cell_data (GtkTreeViewColumn *column,
+ GtkCellRenderer *renderer,
+ GtkTreeModel *tree_model,
+ GtkTreeIter *iter,
+ gpointer data)
{
- GObject *rendobj = (GObject *) renderer, *instance = NULL;
+ GObject *rendobj = NULL, *instance = NULL;
TnyFolderType type = TNY_FOLDER_TYPE_UNKNOWN;
gboolean has_children;
ThreePixbufs *pixbufs;
+ rendobj = (GObject *) renderer;
+
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,
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;
TnyAccount *tny_account,
gpointer user_data)
{
- /* do nothing */
ModestFolderViewPrivate *priv;
GtkTreeModel *sort_model, *filter_model;
/* Get the inner model */
filter_model = gtk_tree_view_get_model (GTK_TREE_VIEW (user_data));
sort_model = gtk_tree_model_filter_get_model (GTK_TREE_MODEL_FILTER (filter_model));
-
+
/* 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));
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;
+}
static void
ModestFolderViewPrivate *priv;
GtkTreeModel *sort_model, *filter_model;
GtkTreeSelection *sel = NULL;
+ gboolean same_account_selected = FALSE;
/* Ignore transport account removals, we're not showing them
in the folder view */
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);
}
folder_to_select_account = tny_folder_get_account (priv->folder_to_select);
if (folder_to_select_account == account) {
-/* modest_folder_view_disable_next_folder_selection (self); */
+ modest_folder_view_disable_next_folder_selection (self);
g_object_unref (priv->folder_to_select);
priv->folder_to_select = NULL;
}
/* Select the first INBOX if the currently selected folder
belongs to the account that is being deleted */
- if (priv->cur_folder_store) {
- TnyAccount *folder_selected_account;
-
- folder_selected_account = (TNY_IS_FOLDER (priv->cur_folder_store)) ?
- modest_tny_folder_get_account (TNY_FOLDER (priv->cur_folder_store)) :
- TNY_ACCOUNT (g_object_ref (priv->cur_folder_store));
- if (account == folder_selected_account)
- modest_folder_view_select_first_inbox_or_local (self);
- g_object_unref (folder_selected_account);
- }
+ if (same_account_selected)
+ g_idle_add (on_idle_select_first_inbox_or_local, self);
}
void
{
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) {
* 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;
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 */
/* New current references */
priv->cur_folder_store = folder;
- /* New folder has been selected */
- g_signal_emit (G_OBJECT(tree_view),
- signals[FOLDER_SELECTION_CHANGED_SIGNAL],
- 0, priv->cur_folder_store, TRUE);
+ /* New folder has been selected. Do not notify if there is
+ nothing new selected */
+ if (selected) {
+ g_signal_emit (G_OBJECT(tree_view),
+ signals[FOLDER_SELECTION_CHANGED_SIGNAL],
+ 0, priv->cur_folder_store, TRUE);
+ }
}
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)
* 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)) {
guint time;
} DndHelper;
+static void
+dnd_helper_destroyer (DndHelper *helper)
+{
+ /* Free the helper */
+ gtk_tree_path_free (helper->source_row);
+ g_slice_free (DndHelper, helper);
+}
/*
* This function is the callback of the
gtk_drag_finish (helper->context, success, FALSE, helper->time);
/* Free the helper */
- gtk_tree_path_free (helper->source_row);
- g_slice_free (DndHelper, helper);
+ dnd_helper_destroyer (helper);
}
/* get the folder for the row the treepath refers to. */
g_object_unref (headers);
}
+typedef struct {
+ TnyFolderStore *src_folder;
+ TnyFolderStore *dst_folder;
+ DndHelper *helper;
+} DndFolderInfo;
+
+static void
+dnd_folder_info_destroyer (DndFolderInfo *info)
+{
+ if (info->src_folder)
+ g_object_unref (info->src_folder);
+ if (info->dst_folder)
+ g_object_unref (info->dst_folder);
+ g_slice_free (DndFolderInfo, info);
+}
+
+static void
+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
+drag_and_drop_from_folder_view_src_folder_performer (gboolean canceled,
+ GError *err,
+ GtkWindow *parent_window,
+ TnyAccount *account,
+ gpointer user_data)
+{
+ DndFolderInfo *info = NULL;
+ ModestMailOperation *mail_op;
+
+ info = (DndFolderInfo *) user_data;
+
+ if (err || canceled) {
+ dnd_on_connection_failed_destroyer (info, parent_window, account);
+ return;
+ }
+
+ /* Do the mail operation */
+ mail_op = modest_mail_operation_new_with_error_handling ((GObject *) parent_window,
+ modest_ui_actions_move_folder_error_handler,
+ info->src_folder, NULL);
+
+ modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+ mail_op);
+
+ /* Transfer the folder */
+ modest_mail_operation_xfer_folder (mail_op,
+ TNY_FOLDER (info->src_folder),
+ info->dst_folder,
+ info->helper->delete_source,
+ xfer_cb,
+ info->helper);
+
+ g_object_unref (G_OBJECT (mail_op));
+}
+
+
+static void
+drag_and_drop_from_folder_view_dst_folder_performer (gboolean canceled,
+ GError *err,
+ GtkWindow *parent_window,
+ TnyAccount *account,
+ gpointer user_data)
+{
+ DndFolderInfo *info = NULL;
+
+ info = (DndFolderInfo *) user_data;
+
+ if (err || canceled) {
+ dnd_on_connection_failed_destroyer (info, parent_window, account);
+ return;
+ }
+
+ /* Connect to source folder and perform the copy/move */
+ modest_platform_connect_if_remote_and_perform (NULL,
+ info->src_folder,
+ drag_and_drop_from_folder_view_src_folder_performer,
+ info);
+}
+
/*
* This function is used by drag_data_received_cb to manage drag and
* drop of a folder, i.e, and drag from the folder view to the same
GtkSelectionData *selection_data,
DndHelper *helper)
{
- ModestMailOperation *mail_op = NULL;
GtkTreeIter dest_iter, iter;
TnyFolderStore *dest_folder = NULL;
TnyFolderStore *folder = NULL;
gboolean forbidden = FALSE;
ModestWindow *win;
+ DndFolderInfo *info = NULL;
win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), FALSE); /* don't create */
if (!win) {
TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN,
&folder, -1);
- /* Offer the connection dialog if necessary, for the destination parent folder and source folder: */
- if (modest_platform_connect_and_wait_if_network_folderstore (NULL, dest_folder) &&
- modest_platform_connect_and_wait_if_network_folderstore (NULL, TNY_FOLDER_STORE (folder))) {
-
- /* Do the mail operation */
- mail_op = modest_mail_operation_new_with_error_handling ((GObject *) win,
- modest_ui_actions_move_folder_error_handler,
- folder, NULL);
-
- modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
- mail_op);
-
- modest_mail_operation_xfer_folder (mail_op,
- TNY_FOLDER (folder),
- dest_folder,
- helper->delete_source,
- xfer_cb,
- helper);
-
- g_object_unref (G_OBJECT (mail_op));
- }
+ /* Create the info for the performer */
+ info = g_slice_new (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_if_remote_and_perform (GTK_WINDOW (win),
+ dest_folder,
+ drag_and_drop_from_folder_view_dst_folder_performer,
+ info);
/* Frees */
- g_object_unref (G_OBJECT (dest_folder));
- g_object_unref (G_OBJECT (folder));
+ g_object_unref (dest_folder);
+ g_object_unref (folder);
}
/*
GtkTreeViewDropPosition pos;
gboolean result = FALSE;
- GDK_THREADS_ENTER ();
+ gdk_threads_enter ();
gtk_tree_view_get_drag_dest_row (tree_view,
&dest_path,
result = TRUE;
}
- GDK_THREADS_LEAVE ();
+ gdk_threads_leave ();
return result;
}
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)) {
gdk_drag_status(context, GDK_ACTION_DEFAULT, time);
out:
+ if (folder)
+ g_object_unref (folder);
if (dest_row)
gtk_tree_path_free (dest_row);
g_signal_stop_emission_by_name (widget, "drag-motion");
{
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);
{
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);
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;
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)
{
- 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)
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);
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;
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
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 */
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));
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())); */