diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 10 | ||||
| -rw-r--r-- | mail/em-folder-tree.c | 19 |
2 files changed, 22 insertions, 7 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index ab07283b92..1ee08023ec 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,13 @@ +2003-12-01 Radek Doulik <rodo@ximian.com> + + * em-folder-tree.c (render_pixbuf): use CAMEL_VTRASH_NAME, + CAMEL_VJUNK_NAME + +2003-11-28 Radek Doulik <rodo@ximian.com> + + * em-folder-tree.c (render_pixbuf): added junk icon to folder + icons + 2003-12-01 Not Zed <NotZed@Ximian.com> * em-folder-browser.c (emfb_edit_cut, emfb_edit_copy) diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index dbcbb50eaa..473ffa83ed 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -233,10 +233,12 @@ enum { FOLDER_ICON_NORMAL, FOLDER_ICON_INBOX, FOLDER_ICON_OUTBOX, - FOLDER_ICON_TRASH + FOLDER_ICON_TRASH, + FOLDER_ICON_JUNK, + FOLDER_ICON_LAST }; -static GdkPixbuf *folder_icons[4]; +static GdkPixbuf *folder_icons[FOLDER_ICON_LAST]; static void render_pixbuf (GtkTreeViewColumn *column, GtkCellRenderer *renderer, @@ -248,10 +250,11 @@ render_pixbuf (GtkTreeViewColumn *column, GtkCellRenderer *renderer, char *path; if (!initialised) { - folder_icons[0] = gdk_pixbuf_new_from_file (EVOLUTION_ICONSDIR "/folder-mini.png", NULL); - folder_icons[1] = gdk_pixbuf_new_from_file (EVOLUTION_ICONSDIR "/inbox-mini.png", NULL); - folder_icons[2] = gdk_pixbuf_new_from_file (EVOLUTION_ICONSDIR "/outbox-mini.png", NULL); - folder_icons[3] = gdk_pixbuf_new_from_file (EVOLUTION_ICONSDIR "/evolution-trash-mini.png", NULL); + folder_icons[FOLDER_ICON_NORMAL] = gdk_pixbuf_new_from_file (EVOLUTION_ICONSDIR "/folder-mini.png", NULL); + folder_icons[FOLDER_ICON_INBOX] = gdk_pixbuf_new_from_file (EVOLUTION_ICONSDIR "/inbox-mini.png", NULL); + folder_icons[FOLDER_ICON_OUTBOX] = gdk_pixbuf_new_from_file (EVOLUTION_ICONSDIR "/outbox-mini.png", NULL); + folder_icons[FOLDER_ICON_TRASH] = gdk_pixbuf_new_from_file (EVOLUTION_ICONSDIR "/evolution-trash-mini.png", NULL); + folder_icons[FOLDER_ICON_JUNK] = gdk_pixbuf_new_from_file (EVOLUTION_ICONSDIR "/evolution-junk-mini.png", NULL); initialised = TRUE; } @@ -263,8 +266,10 @@ render_pixbuf (GtkTreeViewColumn *column, GtkCellRenderer *renderer, pixbuf = folder_icons[FOLDER_ICON_INBOX]; else if (!strcasecmp (path, "/Outbox")) pixbuf = folder_icons[FOLDER_ICON_OUTBOX]; - else if (!strcasecmp (path, "/Trash")) + else if if (*path == '/' && !strcasecmp (path + 1, CAMEL_VTRASH_NAME)) pixbuf = folder_icons[FOLDER_ICON_TRASH]; + else if (*path == '/' && !strcasecmp (path + 1, CAMEL_VJUNK_NAME)) + pixbuf = folder_icons[FOLDER_ICON_JUNK]; else pixbuf = folder_icons[FOLDER_ICON_NORMAL]; } |