* src/widgets/modest-header-view-render.c:

        * When we want to fill the attach and priority icons with an empty value
          (and show them in blank) we don't need to retrieve a non existing icon,
          setting a NULL to the pixbuf cell renderer works. This fix removes
          a warning on runtime.
* src/maemo/modest-icon-names.h:
        * Updated the trash and junk icon names. This removes also warnings trying
          to get non existing icons in theme.

pmo-trunk-r2013

diff --git a/src/maemo/modest-icon-names.h b/src/maemo/modest-icon-names.h
index fc05791..f6fe4dc 100644 (file)
--- a/src/maemo/modest-icon-names.h
+++ b/src/maemo/modest-icon-names.h
@@ -66,8 +66,8 @@
 #define MODEST_FOLDER_ICON_INBOX               "qgn_list_messagin_inbox"
 #define MODEST_FOLDER_ICON_OUTBOX              "qgn_list_messagin_outbox"
 #define MODEST_FOLDER_ICON_SENT                        "qgn_list_messagin_sent"
-#define MODEST_FOLDER_ICON_TRASH               "qgn_toolb_messagin_delete"
-#define MODEST_FOLDER_ICON_JUNK                        "qgn_toolb_messagin_delete"
+#define MODEST_FOLDER_ICON_TRASH               "qgn_toolb_gene_deletebutton"
+#define MODEST_FOLDER_ICON_JUNK                        "qgn_toolb_gene_deletebutton"
 #define MODEST_FOLDER_ICON_DRAFTS              "qgn_list_messagin_drafts"
 #define MODEST_FOLDER_ICON_NORMAL              "qgn_list_gene_fldr_cls"
 #define MODEST_FOLDER_ICON_LOCAL_FOLDERS       "qgn_list_shell_mydevice"

diff --git a/src/widgets/modest-header-view-render.c b/src/widgets/modest-header-view-render.c
index 6ab9e3b..b3bcbdb 100644 (file)
--- a/src/widgets/modest-header-view-render.c
+++ b/src/widgets/modest-header-view-render.c
@@ -235,14 +235,14 @@ _modest_header_view_compact_header_cell_data  (GtkTreeViewColumn *column,  GtkCe
                              NULL);
        else
                g_object_set (G_OBJECT (attach_cell), "pixbuf",
-                             get_pixbuf_for_flag (0), NULL);
+                             NULL, NULL);
        if (flags & TNY_HEADER_FLAG_PRIORITY)
                g_object_set (G_OBJECT (priority_cell), "pixbuf",
                              get_pixbuf_for_flag (flags & TNY_HEADER_FLAG_PRIORITY),
                              NULL);
        else
                g_object_set (G_OBJECT (priority_cell), "pixbuf",
-                             get_pixbuf_for_flag (0), NULL);
+                             NULL, NULL);
        header = g_markup_printf_escaped ("%s", (subject && strlen (subject)) ? subject : _("mail_va_no_subject"));
        g_free (subject);
        g_object_set (G_OBJECT (subject_cell), "markup", header, NULL);