diff options
| -rw-r--r-- | mail/ChangeLog | 11 | ||||
| -rw-r--r-- | mail/em-folder-tree.c | 2 | ||||
| -rw-r--r-- | mail/em-folder-view.c | 5 |
3 files changed, 14 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index a1055fd224..3583dc3a62 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,14 @@ +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 + 2006-04-26 Srinivasa Ragavan <sragavan@novell.com> ** Patch from Victor for adding a Sender header to message list. diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 465642935c..687e4206fc 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -287,7 +287,7 @@ render_pixbuf (GtkTreeViewColumn *column, GtkCellRenderer *renderer, folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("stock_folder", E_ICON_SIZE_MENU); folder_icons[FOLDER_ICON_INBOX] = e_icon_factory_get_icon ("stock_inbox", E_ICON_SIZE_MENU); folder_icons[FOLDER_ICON_OUTBOX] = e_icon_factory_get_icon ("stock_outbox", E_ICON_SIZE_MENU); - folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("stock_delete", E_ICON_SIZE_MENU); + folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("gnome-fs-trash-empty", E_ICON_SIZE_MENU); folder_icons[FOLDER_ICON_JUNK] = e_icon_factory_get_icon ("stock_spam", E_ICON_SIZE_MENU); folder_icons[FOLDER_ICON_SHARED_TO_ME] = e_icon_factory_get_icon ("stock_shared-to-me", E_ICON_SIZE_MENU); folder_icons[FOLDER_ICON_SHARED_BY_ME] = e_icon_factory_get_icon ("stock_shared-by-me", E_ICON_SIZE_MENU); 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), |