[evolution] remove more complex pieces in the UI

[Matthew Barnes <mbarnes src gnome org>]

commit 836958c07600f5834e080424948cd61206a5c519
Author: Michael Meeks <michael meeks novell com>
Date:   Wed Mar 3 09:14:58 2010 +0000

    remove more complex pieces in the UI

 ui/evolution-mail-reader.ui |    2 ++
 ui/evolution-shell.ui       |    6 ++++++
 2 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/ui/evolution-mail-reader.ui b/ui/evolution-mail-reader.ui
index b5aef12..4ca9522 100644
--- a/ui/evolution-mail-reader.ui
+++ b/ui/evolution-mail-reader.ui
@@ -25,8 +25,10 @@
       <separator/>
       <placeholder name='mail-message-view-actions'>
         <menuitem action='mail-load-images'/>
+<!-- if !EXPRESS -->
         <menuitem action='mail-show-all-headers'/>
         <menuitem action='mail-caret-mode'/>
+<!-- endif -->
         <menuitem action='mail-show-source'/>
         <menu action='mail-zoom-menu'>
           <menuitem action='mail-zoom-in'/>
diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
index eb11673..3b3211a 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -2,7 +2,9 @@
   <menubar name='main-menu'>
     <menu action='file-menu'>
       <menu action='new-menu'/>
+<!-- if !EXPRESS -->
       <menuitem action='new-window'/>
+<!-- endif -->
       <separator/>
       <menuitem action='send-receive'/>
       <placeholder name='file-actions'/>
@@ -43,13 +45,16 @@
         <separator/>
         <menuitem action='gal-define-views'/>
       </menu>
+<!-- if !EXPRESS -->
       <menu action='window-menu'/>
+<!-- endif -->
       <menu action='layout-menu'>
         <menuitem action='show-toolbar'/>
         <menuitem action='show-taskbar'/>
         <menuitem action='show-sidebar'/>
       </menu>
       <placeholder name='view-custom-menus'/>
+<!-- if !EXPRESS -->
       <menu action='switcher-menu'>
         <menuitem action='switcher-style-both'/>
         <menuitem action='switcher-style-icons'/>
@@ -58,6 +63,7 @@
         <separator/>
         <menuitem action='show-switcher'/>
       </menu>
+<!-- endif -->
     </menu>
     <placeholder name='custom-menus'/>
     <menu action='search-menu'>