diff options
| author | Suman Manjunath <msuman@src.gnome.org> | 2008-01-07 02:02:18 +0800 |
|---|---|---|
| committer | Suman Manjunath <msuman@src.gnome.org> | 2008-01-07 02:02:18 +0800 |
| commit | 00d89fdac2c92ceeae3478713f6fc247841d3da7 (patch) | |
| tree | 780bcf00829fc1bccad90ccdee387aa1bc160693 /mail/em-folder-view.c | |
| parent | 82f7125f45269be8d2cded86d8c7fe37bd0364dc (diff) | |
| download | gsoc2013-evolution-00d89fdac2c92ceeae3478713f6fc247841d3da7.tar.gz gsoc2013-evolution-00d89fdac2c92ceeae3478713f6fc247841d3da7.tar.zst gsoc2013-evolution-00d89fdac2c92ceeae3478713f6fc247841d3da7.zip | |
Patch from Michael Monreal <michael.monreal@gmx.net>: Fix for bug #492188 (Use the new Tangoized icons instead of the deprecated ones from gnome-icon-theme)
M addressbook/gui/component/addressbook-view.c
M addressbook/ChangeLog
AM data/icons/hicolor_actions_16x16_mail-move.png
AM data/icons/hicolor_actions_16x16_mail-copy.png
AM data/icons/hicolor_actions_16x16_folder-move.png
M data/icons/Makefile.am
AM data/icons/hicolor_actions_16x16_folder-copy.png
M mail/em-folder-browser.c
M mail/ChangeLog
M mail/em-folder-tree.c
M mail/em-folder-view.c
M mail/message-list.c
M composer/ChangeLog
M composer/e-msg-composer.c
M ChangeLog
M calendar/gui/dialogs/comp-editor.c
M calendar/ChangeLog
svn path=/trunk/; revision=34769
Diffstat (limited to 'mail/em-folder-view.c')
| -rw-r--r-- | mail/em-folder-view.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index 85d7334dcb..1758735ab3 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -1326,8 +1326,8 @@ 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, "edit-delete", EM_POPUP_SELECT_DELETE|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 }, + { E_POPUP_ITEM, "40.emfv.02", N_("_Move to Folder..."), emfv_popup_move, NULL, "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, "mail-copy", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, { E_POPUP_BAR, "50.emfv", NULL, NULL, NULL, NULL }, { E_POPUP_ITEM, "50.emfv.00", N_("Mar_k as Read"), emfv_popup_mark_read, NULL, "mail-mark-read", EM_POPUP_SELECT_MARK_READ|EM_FOLDER_VIEW_SELECT_LISTONLY }, @@ -2089,7 +2089,7 @@ static EPixmap emfv_message_pixmaps[] = { E_PIXMAP ("/commands/EditPaste", "edit-paste", E_ICON_SIZE_MENU), E_PIXMAP ("/commands/MailCompose", "mail-message-new", E_ICON_SIZE_MENU), E_PIXMAP ("/commands/MessageApplyFilters", "stock_mail-filters-apply", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageCopy", "stock_mail-copy", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageCopy", "mail-copy", E_ICON_SIZE_MENU), E_PIXMAP ("/commands/MessageDelete", "user-trash", E_ICON_SIZE_MENU), E_PIXMAP ("/commands/MessageFilterJunk", "mail-mark-junk", E_ICON_SIZE_MENU), E_PIXMAP ("/commands/MessageFollowUpFlag", "stock_mail-flag-for-followup", E_ICON_SIZE_MENU), @@ -2099,7 +2099,7 @@ static EPixmap emfv_message_pixmaps[] = { E_PIXMAP ("/commands/MessageMarkAsNotJunk", "mail-mark-notjunk", E_ICON_SIZE_MENU), E_PIXMAP ("/commands/MessageMarkAsRead", "mail-mark-read", E_ICON_SIZE_MENU), E_PIXMAP ("/commands/MessageMarkAsUnRead", "mail-mark-unread", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageMove", "stock_mail-move", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageMove", "mail-move", E_ICON_SIZE_MENU), E_PIXMAP ("/commands/MessageReplyAll", "mail-reply-all", E_ICON_SIZE_MENU), E_PIXMAP ("/commands/MessageReplySender", "mail-reply-sender", E_ICON_SIZE_MENU), E_PIXMAP ("/commands/MessageSaveAs", "document-save-as", E_ICON_SIZE_MENU), @@ -2117,8 +2117,8 @@ static EPixmap emfv_message_pixmaps[] = { E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplyAll", "mail-reply-all", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageForward", "mail-forward", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP ("/Toolbar/MailMessageToolbar/PrintMessage", "document-print", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMove", "stock_mail-move", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageCopy", "stock_mail-copy", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMove", "mail-move", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageCopy", "mail-copy", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageDelete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMarkAsJunk", "mail-mark-junk", E_ICON_SIZE_LARGE_TOOLBAR), E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMarkAsNotJunk", "mail-mark-notjunk", E_ICON_SIZE_LARGE_TOOLBAR), |