aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-05-27 22:22:55 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-05-27 22:22:55 +0800
commitaa6b661fdfe7416a58ac3fc93926b798260c54bc (patch)
tree30eb02b865d4b766e60da4cdc109adf625955e39 /modules
parent55c4f30db73b6078d8d0b8bd74a038d39f096b04 (diff)
downloadgsoc2013-evolution-aa6b661fdfe7416a58ac3fc93926b798260c54bc.tar
gsoc2013-evolution-aa6b661fdfe7416a58ac3fc93926b798260c54bc.tar.gz
gsoc2013-evolution-aa6b661fdfe7416a58ac3fc93926b798260c54bc.tar.bz2
gsoc2013-evolution-aa6b661fdfe7416a58ac3fc93926b798260c54bc.tar.lz
gsoc2013-evolution-aa6b661fdfe7416a58ac3fc93926b798260c54bc.tar.xz
gsoc2013-evolution-aa6b661fdfe7416a58ac3fc93926b798260c54bc.tar.zst
gsoc2013-evolution-aa6b661fdfe7416a58ac3fc93926b798260c54bc.zip
Revert "Work around another dropped gnome-icon-theme icon."
This reverts commit 43e2c871a418b560b391af00df2b10896055026c. Correct icon name is "mail-mark-notjunk". The previous fix got clobbered by the express2 merge.
Diffstat (limited to 'modules')
-rw-r--r--modules/mail/e-mail-shell-view-actions.c2
-rw-r--r--modules/mail/e-mail-shell-view-actions.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index 2fa6389bd0..63b5b4f400 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -1162,7 +1162,7 @@ static GtkRadioActionEntry mail_filter_entries[] = {
MAIL_FILTER_LAST_5_DAYS_MESSAGES },
{ "mail-filter-messages-not-junk",
- "mail-mark-not-junk",
+ "mail-mark-notjunk",
N_("Messages Not Junk"),
NULL,
NULL, /* XXX Add a tooltip! */
diff --git a/modules/mail/e-mail-shell-view-actions.h b/modules/mail/e-mail-shell-view-actions.h
index cc7552e27c..34f6e6c8f9 100644
--- a/modules/mail/e-mail-shell-view-actions.h
+++ b/modules/mail/e-mail-shell-view-actions.h
@@ -109,8 +109,8 @@
E_SHELL_WINDOW_ACTION ((window), "mail-mark-important")
#define E_SHELL_WINDOW_ACTION_MAIL_MARK_JUNK(window) \
E_SHELL_WINDOW_ACTION ((window), "mail-mark-junk")
-#define E_SHELL_WINDOW_ACTION_MAIL_MARK_NOT_JUNK(window) \
- E_SHELL_WINDOW_ACTION ((window), "mail-mark-not-junk")
+#define E_SHELL_WINDOW_ACTION_MAIL_MARK_NOTJUNK(window) \
+ E_SHELL_WINDOW_ACTION ((window), "mail-mark-notjunk")
#define E_SHELL_WINDOW_ACTION_MAIL_MARK_READ(window) \
E_SHELL_WINDOW_ACTION ((window), "mail-mark-read")
#define E_SHELL_WINDOW_ACTION_MAIL_MARK_UNIMPORTANT(window) \