From c22126d54f0cf0637e3d5ddd5d78b3ff5d111582 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Sat, 17 Jan 2009 20:06:17 +0000
Subject: Hack GtkIconTheme so we can reference category icons as named icons.
 Necessary for EActionComboBox, since GtkActions can only handle named or
 stock icons.  Hopefully this is just a temporary hack.  Eventually we should
 make the category icons themeable.

Kill the "mail-account-disable" plugin and integrate it properly.
More dead plugins to follow...

Don't show disabled menu items in pop-up context menus.  It does the
user no good to see things he CAN'T do with the object he clicked on.

svn path=/branches/kill-bonobo/; revision=37093
---
 ui/evolution-mail.ui | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'ui')

diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui
index 76e93a43b4..cc5a4d348c 100644
--- a/ui/evolution-mail.ui
+++ b/ui/evolution-mail.ui
@@ -67,18 +67,19 @@
     <placeholder name='mail-toolbar-navigation'/>
   </toolbar>
   <popup name='mail-folder-popup'>
-    <menuitem action='mail-folder-new'/>
-    <menuitem action='mail-folder-copy'/>
-    <menuitem action='mail-folder-move'/>
+    <menuitem action='mail-popup-folder-new'/>
+    <menuitem action='mail-popup-folder-copy'/>
+    <menuitem action='mail-popup-folder-move'/>
     <separator/>
-    <menuitem action='mail-folder-delete'/>
+    <menuitem action='mail-popup-folder-delete'/>
     <separator/>
-    <menuitem action='mail-folder-rename'/>
-    <menuitem action='mail-folder-refresh'/>
+    <menuitem action='mail-popup-folder-rename'/>
+    <menuitem action='mail-popup-folder-refresh'/>
     <menuitem action='mail-flush-outbox'/>
     <menuitem action='mail-empty-trash'/>
+    <menuitem action='mail-account-disable'/>
     <separator/>
-    <menuitem action='mail-folder-properties'/>
+    <menuitem action='mail-popup-folder-properties'/>
   </popup>
   <popup name='mail-search-options'>
     <menuitem action='mail-search-subject-or-sender-contains'/>
-- 
cgit v1.2.3