From aa6b661fdfe7416a58ac3fc93926b798260c54bc Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 27 May 2010 10:22:55 -0400
Subject: 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.
---
 mail/e-mail-reader.c                     | 10 +++++-----
 modules/mail/e-mail-shell-view-actions.c |  2 +-
 modules/mail/e-mail-shell-view-actions.h |  4 ++--
 ui/evolution-mail-reader.ui              |  4 ++--
 ui/evolution-mail.ui                     |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index f86b2257a9..70bed6b92e 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -1288,8 +1288,8 @@ static GtkActionEntry mail_reader_entries[] = {
 	  N_("Mark the selected messages as junk"),
 	  G_CALLBACK (action_mail_mark_junk_cb) },
 
-	{ "mail-mark-not-junk",
-	  "mail-mark-not-junk",
+	{ "mail-mark-notjunk",
+	  "mail-mark-notjunk",
 	  N_("_Not Junk"),
 	  "<Shift><Control>j",
 	  N_("Mark the selected messages as not being junk"),
@@ -1598,9 +1598,9 @@ static EPopupActionEntry mail_reader_popup_entries[] = {
 	  N_("Mark as _Junk"),
 	  "mail-mark-junk" },
 
-	{ "mail-popup-mark-not-junk",
+	{ "mail-popup-mark-notjunk",
 	  N_("Mark as _Not Junk"),
-	  "mail-mark-not-junk" },
+	  "mail-mark-notjunk" },
 
 	{ "mail-popup-mark-read",
 	  N_("Mar_k as Read"),
@@ -2309,7 +2309,7 @@ mail_reader_update_actions (EMailReader *reader)
 	action = e_mail_reader_get_action (reader, action_name);
 	gtk_action_set_sensitive (action, sensitive);
 
-	action_name = "mail-mark-not-junk";
+	action_name = "mail-mark-notjunk";
 	sensitive = selection_has_junk_messages;
 	action = e_mail_reader_get_action (reader, action_name);
 	gtk_action_set_sensitive (action, sensitive);
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) \
diff --git a/ui/evolution-mail-reader.ui b/ui/evolution-mail-reader.ui
index 53cb8845d3..ad0b401676 100644
--- a/ui/evolution-mail-reader.ui
+++ b/ui/evolution-mail-reader.ui
@@ -82,7 +82,7 @@
           <menuitem action="mail-mark-unimportant"/>
           <separator/>
           <menuitem action="mail-mark-junk"/>
-          <menuitem action="mail-mark-not-junk"/>
+          <menuitem action="mail-mark-notjunk"/>
           <separator/>
           <menuitem action="mail-flag-for-followup"/>
           <menuitem action="mail-flag-clear"/>
@@ -127,7 +127,7 @@
 #endif
       <toolitem action='mail-delete'/>
       <toolitem action='mail-mark-junk'/>
-      <toolitem action='mail-mark-not-junk'/>
+      <toolitem action='mail-mark-notjunk'/>
     </placeholder>
     <separator/>
     <placeholder name='mail-toolbar-navigation'>
diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui
index cc1b9b5fd8..7c4db78b85 100644
--- a/ui/evolution-mail.ui
+++ b/ui/evolution-mail.ui
@@ -108,7 +108,7 @@
     <menuitem action='mail-popup-mark-important'/>
     <menuitem action='mail-popup-mark-unimportant'/>
     <menuitem action='mail-popup-mark-junk'/>
-    <menuitem action='mail-popup-mark-not-junk'/>
+    <menuitem action='mail-popup-mark-notjunk'/>
     <menuitem action='mail-popup-flag-for-followup'/>
     <menuitem action="mail-popup-flag-clear"/>
     <menuitem action="mail-popup-flag-completed"/>
-- 
cgit v1.2.3