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.
---
 ui/evolution-mail-reader.ui | 4 ++--
 ui/evolution-mail.ui        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'ui')

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