diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 12 | ||||
| -rw-r--r-- | mail/em-folder-browser.c | 4 | ||||
| -rw-r--r-- | mail/em-folder-tree.c | 8 | ||||
| -rw-r--r-- | mail/em-folder-view.c | 12 | ||||
| -rw-r--r-- | mail/message-list.c | 4 |
5 files changed, 26 insertions, 14 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index f78fcdc96c..06746ba2e4 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,15 @@ +2008-01-06 Michael Monreal <michael.monreal@gmx.net> + + ** Fix for bug #492188 + + * em-folder-browser.c: + * em-folder-tree.c: + * em-folder-view.c: + * message-list.c: + + Use the new Tangoized icons instead of deprecated icons from + gnome-icon-theme. + 2008-01-02 Milan Crha <mcrha@redhat.com> ** Fix for bug #317823 diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index f44a0e4648..521f7df518 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -1655,8 +1655,8 @@ static BonoboUIVerb emfb_verbs[] = { static EPixmap emfb_pixmaps[] = { E_PIXMAP ("/commands/ChangeFolderProperties", "document-properties", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/FolderCopy", "stock_folder-copy", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/FolderMove", "stock_folder-move", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FolderCopy", "folder-copy", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FolderMove", "folder-move", E_ICON_SIZE_MENU), E_PIXMAP ("/commands/MessageMarkAllAsRead", "mail-read", E_ICON_SIZE_MENU), E_PIXMAP_END diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c index 03475e51e8..a0af89920f 100644 --- a/mail/em-folder-tree.c +++ b/mail/em-folder-tree.c @@ -1010,8 +1010,8 @@ emft_drop_popup_cancel(EPopup *ep, EPopupItem *item, void *data) static EPopupItem emft_drop_popup_menu[] = { { E_POPUP_ITEM, "00.emc.00", N_("_Copy to Folder"), emft_drop_popup_copy, NULL, NULL, 1 }, { E_POPUP_ITEM, "00.emc.01", N_("_Move to Folder"), emft_drop_popup_move, NULL, NULL, 1 }, - { E_POPUP_ITEM, "00.emc.02", N_("_Copy"), emft_drop_popup_copy, NULL, "stock_folder-copy", 2 }, - { E_POPUP_ITEM, "00.emc.03", N_("_Move"), emft_drop_popup_move, NULL, "stock_folder-move", 2 }, + { E_POPUP_ITEM, "00.emc.02", N_("_Copy"), emft_drop_popup_copy, NULL, "folder-copy", 2 }, + { E_POPUP_ITEM, "00.emc.03", N_("_Move"), emft_drop_popup_move, NULL, "folder-move", 2 }, { E_POPUP_BAR, "10.emc" }, { E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), emft_drop_popup_cancel, NULL, "dialog-cancel", 0 }, }; @@ -2099,8 +2099,8 @@ static EPopupItem emft_popup_items[] = { /* FIXME: need to disable for nochildren folders */ { E_POPUP_ITEM, "10.emc.00", N_("_New Folder..."), emft_popup_new_folder, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }, - { E_POPUP_ITEM, "10.emc.05", N_("_Copy..."), emft_popup_copy, NULL, "stock_folder-copy", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT }, - { E_POPUP_ITEM, "10.emc.06", N_("_Move..."), emft_popup_move, NULL, "stock_folder-move", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, + { E_POPUP_ITEM, "10.emc.05", N_("_Copy..."), emft_popup_copy, NULL, "folder-copy", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT }, + { E_POPUP_ITEM, "10.emc.06", N_("_Move..."), emft_popup_move, NULL, "folder-move", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, /* FIXME: need to disable for undeletable folders */ { E_POPUP_BAR, "20.emc" }, 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), diff --git a/mail/message-list.c b/mail/message-list.c index 94f60a18ae..6920141b27 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -2054,8 +2054,8 @@ ml_drop_popup_cancel(EPopup *ep, EPopupItem *item, void *data) } static EPopupItem ml_drop_popup_menu[] = { - { E_POPUP_ITEM, "00.emc.02", N_("_Copy"), ml_drop_popup_copy, NULL, "stock_folder-copy", 0 }, - { E_POPUP_ITEM, "00.emc.03", N_("_Move"), ml_drop_popup_move, NULL, "stock_folder-move", 0 }, + { E_POPUP_ITEM, "00.emc.02", N_("_Copy"), ml_drop_popup_copy, NULL, "folder-copy", 0 }, + { E_POPUP_ITEM, "00.emc.03", N_("_Move"), ml_drop_popup_move, NULL, "folder-move", 0 }, { E_POPUP_BAR, "10.emc" }, { E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), ml_drop_popup_cancel, NULL, NULL, 0 }, }; |