diff options
| -rw-r--r-- | mail/ChangeLog | 9 | ||||
| -rw-r--r-- | mail/em-folder-browser.c | 2 | ||||
| -rw-r--r-- | mail/em-folder-view.c | 4 | ||||
| -rw-r--r-- | mail/message-list.c | 2 |
4 files changed, 13 insertions, 4 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index 50346e240d..6f9de05bd4 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,12 @@ +2007-04-03 Matthew Barnes <mbarnes@redhat.com> + + * em-folder-browser.c: + * em-folder-view.c: + * message-list.c: + Load "emblem-important" instead of deprecated + "stock_mail-priority-high" icon. (#387619) + Patch from Rodney Dawes. + 2007-04-01 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #373117 diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c index 2903a2e19d..267341c7fc 100644 --- a/mail/em-folder-browser.c +++ b/mail/em-folder-browser.c @@ -201,7 +201,7 @@ static EMFBSearchBarItem temp_view_items[] = { {{ N_("Recent Messages"), VIEW_RECENT_MESSAGES, 0 }, NULL}, {{ N_("Last 5 Days' Messages"), VIEW_LAST_FIVE_DAYS, 0 }, NULL}, {{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "stock_attach"}, - {{ N_("Important Messages"), VIEW_MESSAGES_MARKED_AS_IMPORTANT, 0}, "stock_mail-priority-high"}, + {{ N_("Important Messages"), VIEW_MESSAGES_MARKED_AS_IMPORTANT, 0}, "emblem-important"}, {{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "stock_not-spam"}, /* { NULL, 0, NULL }, */ /* { N_("Customize"), NOT_IMPLEMENTED, NULL }, */ diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c index a0bf78287f..7246895f99 100644 --- a/mail/em-folder-view.c +++ b/mail/em-folder-view.c @@ -1152,7 +1152,7 @@ static EPopupItem emfv_popup_items[] = { { 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, "stock_mail-open", EM_POPUP_SELECT_MARK_READ|EM_FOLDER_VIEW_SELECT_LISTONLY }, { E_POPUP_ITEM, "50.emfv.01", N_("Mark as _Unread"), emfv_popup_mark_unread, NULL, "stock_mail-unread", EM_POPUP_SELECT_MARK_UNREAD|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "50.emfv.02", N_("Mark as _Important"), emfv_popup_mark_important, NULL, "stock_mail-priority-high", EM_POPUP_SELECT_MARK_IMPORTANT|EM_FOLDER_VIEW_SELECT_LISTONLY }, + { E_POPUP_ITEM, "50.emfv.02", N_("Mark as _Important"), emfv_popup_mark_important, NULL, "emblem-important", EM_POPUP_SELECT_MARK_IMPORTANT|EM_FOLDER_VIEW_SELECT_LISTONLY }, { E_POPUP_ITEM, "50.emfv.03", N_("Mark as Un_important"), emfv_popup_mark_unimportant, NULL, NULL, EM_POPUP_SELECT_MARK_UNIMPORTANT|EM_FOLDER_VIEW_SELECT_LISTONLY }, { E_POPUP_ITEM, "50.emfv.04", N_("Mark as _Junk"), emfv_popup_mark_junk, NULL, "stock_spam", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY|EM_POPUP_SELECT_JUNK }, { E_POPUP_ITEM, "50.emfv.05", N_("Mark as _Not Junk"), emfv_popup_mark_nojunk, NULL, "stock_not-spam", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY|EM_POPUP_SELECT_NOT_JUNK }, @@ -1827,7 +1827,7 @@ static EPixmap emfv_message_pixmaps[] = { E_PIXMAP ("/commands/MessageSaveAs", "stock_save-as", E_ICON_SIZE_MENU), E_PIXMAP ("/commands/MessageMarkAsRead", "stock_mail-open", E_ICON_SIZE_MENU), E_PIXMAP ("/commands/MessageMarkAsUnRead", "stock_mail-unread", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageMarkAsImportant", "stock_mail-priority-high", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/MessageMarkAsImportant", "emblem-important", E_ICON_SIZE_MENU), E_PIXMAP ("/commands/MessageMarkAsJunk", "stock_spam", E_ICON_SIZE_MENU), E_PIXMAP ("/commands/MessageMarkAsNotJunk", "stock_not-spam", E_ICON_SIZE_MENU), E_PIXMAP ("/commands/MessageFollowUpFlag", "stock_mail-flag-for-followup", E_ICON_SIZE_MENU), diff --git a/mail/message-list.c b/mail/message-list.c index 3fda8b9f08..a8adb20121 100644 --- a/mail/message-list.c +++ b/mail/message-list.c @@ -224,7 +224,7 @@ static struct { { "stock_mail-open-multiple", NULL }, { NULL, NULL }, { "stock_attach", NULL }, - { "stock_mail-priority-high", NULL }, + { "emblem-important", NULL }, { "stock_score-lowest", NULL }, { "stock_score-lower", NULL }, { "stock_score-low", NULL }, |