aboutsummaryrefslogtreecommitdiffstats
path: root/mail/em-folder-view.c
diff options
context:
space:
mode:
authorRodney Dawes <dobey@novell.com>2006-04-28 00:45:18 +0800
committerRodney Dawes <dobey@src.gnome.org>2006-04-28 00:45:18 +0800
commit502626fd9c60e6bbf5e9b4abcc1f352fd3bce204 (patch)
treed0d6d9a485d9d808438e5f6cb1b17b29b2a46b31 /mail/em-folder-view.c
parente3e04c94352282f43d26513f4720b7c8ad96ad2a (diff)
downloadgsoc2013-evolution-502626fd9c60e6bbf5e9b4abcc1f352fd3bce204.tar
gsoc2013-evolution-502626fd9c60e6bbf5e9b4abcc1f352fd3bce204.tar.gz
gsoc2013-evolution-502626fd9c60e6bbf5e9b4abcc1f352fd3bce204.tar.bz2
gsoc2013-evolution-502626fd9c60e6bbf5e9b4abcc1f352fd3bce204.tar.lz
gsoc2013-evolution-502626fd9c60e6bbf5e9b4abcc1f352fd3bce204.tar.xz
gsoc2013-evolution-502626fd9c60e6bbf5e9b4abcc1f352fd3bce204.tar.zst
gsoc2013-evolution-502626fd9c60e6bbf5e9b4abcc1f352fd3bce204.zip
Use gnome-fs-trash-empty rather than stock_delete for the Trash folder
2006-04-27 Rodney Dawes <dobey@novell.com> * em-folder-tree.c (render_pixbuf): Use gnome-fs-trash-empty rather than stock_delete for the Trash folder icon * em-folder-view.c (emfv_popup_items[]): Don't set an icon for Undelete (emfv_message_pixmaps[]): Don't set an icon for Undelete and set the icon for deleting a message to gnome-fs-trash-empty, not stock_delete Fixes #339626 svn path=/trunk/; revision=31920
Diffstat (limited to 'mail/em-folder-view.c')
-rw-r--r--mail/em-folder-view.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 54f903c217..7da694b6a0 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -1094,7 +1094,7 @@ static EPopupItem emfv_popup_items[] = {
{ E_POPUP_BAR, "40.emfv", NULL, NULL, NULL, NULL },
{ E_POPUP_ITEM, "40.emfv.00", N_("_Delete"), emfv_popup_delete, NULL, "stock_delete", EM_POPUP_SELECT_DELETE|EM_FOLDER_VIEW_SELECT_LISTONLY },
- { E_POPUP_ITEM, "40.emfv.01", N_("U_ndelete"), emfv_popup_undelete, NULL, "stock_undelete", EM_POPUP_SELECT_UNDELETE|EM_FOLDER_VIEW_SELECT_LISTONLY },
+ { E_POPUP_ITEM, "40.emfv.01", N_("U_ndelete"), emfv_popup_undelete, NULL, NULL, EM_POPUP_SELECT_UNDELETE|EM_FOLDER_VIEW_SELECT_LISTONLY },
{ E_POPUP_ITEM, "40.emfv.02", N_("_Move to Folder..."), emfv_popup_move, NULL, "stock_mail-move", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY },
{ E_POPUP_ITEM, "40.emfv.03", N_("_Copy to Folder..."), emfv_popup_copy, NULL, "stock_mail-copy", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY },
@@ -1752,8 +1752,7 @@ static EPixmap emfv_message_pixmaps[] = {
E_PIXMAP ("/commands/PrintMessage", "stock_print", E_ICON_SIZE_MENU),
E_PIXMAP ("/commands/PrintPreviewMessage", "stock_print-preview", E_ICON_SIZE_MENU),
- E_PIXMAP ("/commands/MessageDelete", "stock_delete", E_ICON_SIZE_MENU),
- E_PIXMAP ("/commands/MessageUndelete", "stock_undelete", E_ICON_SIZE_MENU),
+ E_PIXMAP ("/commands/MessageDelete", "gnome-fs-trash-empty", E_ICON_SIZE_MENU),
E_PIXMAP ("/commands/MessageCopy", "stock_mail-copy", E_ICON_SIZE_MENU),
E_PIXMAP ("/commands/MessageMove", "stock_mail-move", E_ICON_SIZE_MENU),
E_PIXMAP ("/commands/MessageReplyAll", "stock_mail-reply-to-all", E_ICON_SIZE_MENU),