From 15fbc1654e16f3d2a4c6b55b01dc2a76596b07ba Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sun, 31 Mar 2013 09:37:31 -0400
Subject: Remove conditionals from GtkUIManager definitions.

---
 ui/evolution-mail.ui | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'ui/evolution-mail.ui')

diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui
index e191a624a4..6da260acaa 100644
--- a/ui/evolution-mail.ui
+++ b/ui/evolution-mail.ui
@@ -17,14 +17,12 @@
     </menu>
     <menu action='view-menu'>
       <placeholder name='view-custom-menus'>
-#if !EXPRESS
         <menu action='mail-preview-menu'>
           <menuitem action='mail-preview'/>
           <separator/>
           <menuitem action='mail-view-classic'/>
           <menuitem action='mail-view-vertical'/>
         </menu>
-#endif
       </placeholder>
       <separator/>
       <placeholder name='mail-message-list-actions'>
@@ -66,20 +64,11 @@
     <placeholder name='toolbar-actions'>
       <placeholder name='mail-send-receiver'/>
       <separator/>
-#if EXPRESS
-      <toolitem action='new-addressbook-window'/>
-#endif
     </placeholder>
     <placeholder name='mail-toolbar-common'/>
-#if !EXPRESS
     <toolitem action='mail-stop'/>
-#endif
     <separator/>
     <placeholder name='mail-toolbar-navigation'/>
-#if EXPRESS
-    <separator/>
-    <toolitem action='preferences'/>
-#endif
   </toolbar>
   <popup name='mail-folder-popup'>
     <placeholder name='mail-folder-popup-actions'/>
-- 
cgit