aboutsummaryrefslogtreecommitdiffstats
path: root/modules/mail
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2010-04-30 09:08:09 +0800
committerMatthew Barnes <mbarnes@redhat.com>2010-04-30 09:08:09 +0800
commita2019ba327586e97bb303f43d6dddcc279365b20 (patch)
treea0a0c21df63827534368f8f5c56a4cd9843b695e /modules/mail
parente2769948a5e2b95590912c70180ae901d33148cb (diff)
downloadgsoc2013-evolution-a2019ba327586e97bb303f43d6dddcc279365b20.tar
gsoc2013-evolution-a2019ba327586e97bb303f43d6dddcc279365b20.tar.gz
gsoc2013-evolution-a2019ba327586e97bb303f43d6dddcc279365b20.tar.bz2
gsoc2013-evolution-a2019ba327586e97bb303f43d6dddcc279365b20.tar.lz
gsoc2013-evolution-a2019ba327586e97bb303f43d6dddcc279365b20.tar.xz
gsoc2013-evolution-a2019ba327586e97bb303f43d6dddcc279365b20.tar.zst
gsoc2013-evolution-a2019ba327586e97bb303f43d6dddcc279365b20.zip
Revert "Work around another dropped gnome-icon-theme icon."
This reverts commit edf6286a38279e6db82dee4da50e94c587f06e02. gnome-icon-theme got it wrong, not us. See bug #616954.
Diffstat (limited to 'modules/mail')
-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 25fe1d80bc..afe1629e4f 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -1156,7 +1156,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) \