aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2009-01-18 04:06:17 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2009-01-18 04:06:17 +0800
commitc22126d54f0cf0637e3d5ddd5d78b3ff5d111582 (patch)
tree64f296a85dd817e3184159126e8dbde39c173363 /ui
parent4d07d219d1f18aeba2c16317ade4b4004d8934b9 (diff)
downloadgsoc2013-evolution-c22126d54f0cf0637e3d5ddd5d78b3ff5d111582.tar
gsoc2013-evolution-c22126d54f0cf0637e3d5ddd5d78b3ff5d111582.tar.gz
gsoc2013-evolution-c22126d54f0cf0637e3d5ddd5d78b3ff5d111582.tar.bz2
gsoc2013-evolution-c22126d54f0cf0637e3d5ddd5d78b3ff5d111582.tar.lz
gsoc2013-evolution-c22126d54f0cf0637e3d5ddd5d78b3ff5d111582.tar.xz
gsoc2013-evolution-c22126d54f0cf0637e3d5ddd5d78b3ff5d111582.tar.zst
gsoc2013-evolution-c22126d54f0cf0637e3d5ddd5d78b3ff5d111582.zip
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
Diffstat (limited to 'ui')
-rw-r--r--ui/evolution-mail.ui15
1 files changed, 8 insertions, 7 deletions
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'/>