Remove conditionals from GtkUIManager definitions.

8 files changed, 0 insertions, 79 deletions

diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 16d49fdb52..f269cf226b 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -178,15 +178,9 @@ static const gchar *ui =
 "  <toolbar name='main-toolbar'>"
 "    <toolitem action='save-and-close'/>\n"
 "    <toolitem action='save'/>\n"
-"#if !EXPRESS\n"
 "    <toolitem action='print'/>\n"
-"#endif\n"
 "    <separator/>"
 "    <placeholder name='content'/>\n"
-"#if EXPRESS\n"
-"    <separator expand='true'/>\n"
-"    <toolitem action='close'/>\n"
-"#endif\n"
 "  </toolbar>"
 "</ui>";
 
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 2ea6297dcc..81517c3cdd 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -85,17 +85,11 @@ static const gchar *ui =
 "  </menubar>"
 "  <toolbar name='main-toolbar'>"
 "    <placeholder name='content'>\n"
-"#if !EXPRESS\n"
 "      <toolitem action='alarms'/>\n"
-"#endif\n"
 "      <toolitem action='show-time-busy'/>\n"
-"#if !EXPRESS\n"
 "      <toolitem action='recurrence'/>\n"
-"#endif\n"
 "      <toolitem action='all-day-event'/>\n"
-"#if !EXPRESS\n"
 "      <toolitem action='free-busy'/>\n"
-"#endif\n"
 "    </placeholder>"
 "  </toolbar>"
 "</ui>";
diff --git a/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml b/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
index 792023fb10..da0cb293d3 100644
--- a/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
+++ b/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml
@@ -7,7 +7,6 @@
     <hook class="org.gnome.evolution.ui:1.0">
       <ui-manager id="org.gnome.evolution.mail.browser"
                   callback="mail_browser_init">
-#if !EXPRESS
         <menubar name="main-menu">
           <placeholder name="custom-menus">
             <menu action="mail-message-menu">
@@ -30,11 +29,9 @@
             <menuitem action="mail-convert-to-memo"/>
           </placeholder>
         </popup>
-#endif
       </ui-manager>
       <ui-manager id="org.gnome.evolution.mail"
                   callback="mail_shell_view_init">
-#if !EXPRESS
         <menubar name="main-menu">
           <placeholder name="custom-menus">
             <menu action="mail-message-menu">
@@ -68,7 +65,6 @@
           </placeholder>
         </popup>
       </ui-manager>
-#endif
     </hook>
 
   </e-plugin>
diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
index 1c06388b1b..a19eeb6f42 100644
--- a/ui/evolution-calendars.ui
+++ b/ui/evolution-calendars.ui
@@ -6,10 +6,8 @@
         <menuitem action='event-save-as'/>
       </placeholder>
       <placeholder name='print-actions'>
-#if !EXPRESS
         <menuitem action='calendar-print-preview'/>
         <menuitem action='calendar-print'/>
-#endif
       </placeholder>
     </menu>
     <menu action='edit-menu'>
@@ -43,39 +41,23 @@
     </menu>
   </menubar>
   <toolbar name='main-toolbar'>
-#if !EXPRESS
     <toolitem action='calendar-print'/>
     <toolitem action='delete-selection'/>
     <separator/>
-#endif
     <toolitem action='calendar-go-back'/>
     <toolitem action='calendar-go-today'/>
     <toolitem action='calendar-go-forward'/>
-#if !EXPRESS
     <separator/>
     <toolitem action='calendar-jump-to'/>
-#endif
     <separator/>
     <toolitem action='calendar-view-day'/>
     <toolitem action='calendar-view-workweek'/>
-#if !EXPRESS
     <toolitem action='calendar-view-week'/>
-#endif
 
     <toolitem action='calendar-view-month'/>
-#if !EXPRESS
     <toolitem action='calendar-view-list'/>
-#endif
-#if EXPRESS
-    <separator/>
-    <toolitem action='preferences'/>
-#endif
   </toolbar>
   <toolbar name='close-toolbar'>
-#if EXPRESS
-    <separator expand="true"/>
-    <toolitem action='quit-calendar'/>
-#endif
   </toolbar>
   <popup name='calendar-popup'>
     <menuitem action='calendar-new'/>
@@ -93,15 +75,12 @@
     <menuitem action='event-new'/>
     <menuitem action='event-all-day-new'/>
     <menuitem action='event-meeting-new'/>
-#if !EXPRESS
     <menuitem action='task-new'/>
     <separator/>
     <menuitem action='event-popup-print'/>
     <separator/>
-#endif
     <menuitem action='popup-paste-clipboard'/>
     <separator/>
-#if !EXPRESS
     <menu action='gal-view-menu'>
       <menuitem action='calendar-view-day'/>
       <menuitem action='calendar-view-workweek'/>
@@ -113,31 +92,24 @@
     </menu>
     <menuitem action='calendar-popup-go-today'/>
     <menuitem action='calendar-popup-jump-to'/>
-#endif
   </popup>
   <popup name='calendar-event-popup'>
     <menuitem action='event-popup-open'/>
     <menuitem action='event-popup-save-as'/>
-#if !EXPRESS
     <menuitem action='event-popup-print'/>
-#endif
     <separator/>
     <menuitem action='popup-cut-clipboard'/>
     <menuitem action='popup-copy-clipboard'/>
     <menuitem action='popup-paste-clipboard'/>
-#if !EXPRESS
     <separator/>
     <menuitem action='event-popup-copy'/>
     <menuitem action='event-popup-move'/>
-#endif
     <menuitem action='event-popup-delegate'/>
     <menuitem action='event-popup-schedule'/>
     <menuitem action='event-popup-schedule-appointment'/>
-#if !EXPRESS
     <menuitem action='event-popup-forward'/>
     <menuitem action='event-popup-reply'/>
     <menuitem action='event-popup-reply-all'/>
-#endif
     <separator/>
     <menuitem action='event-popup-occurrence-movable'/>
     <menuitem action='event-popup-delete'/>
@@ -152,9 +124,7 @@
     <menuitem action='calendar-memopad-open'/>
     <menuitem action='calendar-memopad-open-url'/>
     <menuitem action='calendar-memopad-save-as'/>
-#if !EXPRESS
     <menuitem action='calendar-memopad-print'/>
-#endif
     <separator/>
     <menuitem action='popup-cut-clipboard'/>
     <menuitem action='popup-copy-clipboard'/>
@@ -170,9 +140,7 @@
     <menuitem action='calendar-taskpad-open'/>
     <menuitem action='calendar-taskpad-open-url'/>
     <menuitem action='calendar-taskpad-save-as'/>
-#if !EXPRESS
     <menuitem action='calendar-taskpad-print'/>
-#endif
     <separator/>
     <menuitem action='popup-cut-clipboard'/>
     <menuitem action='popup-copy-clipboard'/>
diff --git a/ui/evolution-contacts.ui b/ui/evolution-contacts.ui
index 571e825174..45f1a4d201 100644
--- a/ui/evolution-contacts.ui
+++ b/ui/evolution-contacts.ui
@@ -7,10 +7,8 @@
         <menuitem action='address-book-save-as'/>
       </placeholder>
       <placeholder name='print-actions'>
-#if !EXPRESS
         <menuitem action='address-book-print-preview'/>
         <menuitem action='address-book-print'/>
-#endif
       </placeholder>
     </menu>
     <menu action='edit-menu'>
@@ -54,9 +52,7 @@
     </placeholder>
   </menubar>
   <toolbar name='main-toolbar'>
-#if !EXPRESS
     <toolitem action='address-book-print'/>
-#endif
     <toolitem action='delete-selection'/>
     <toolitem action='address-book-stop'/>
   </toolbar>
@@ -79,9 +75,7 @@
     <separator/>
     <menuitem action='contact-popup-open'/>
     <menuitem action='contact-popup-save-as'/>
-#if !EXPRESS
     <menuitem action='contact-popup-print'/>
-#endif
     <separator/>
     <menuitem action='popup-cut-clipboard'/>
     <menuitem action='popup-copy-clipboard'/>
diff --git a/ui/evolution-mail-reader.ui b/ui/evolution-mail-reader.ui
index 4096b8cd10..2d619b8830 100644
--- a/ui/evolution-mail-reader.ui
+++ b/ui/evolution-mail-reader.ui
@@ -25,10 +25,8 @@
       <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'/>
@@ -135,19 +133,15 @@
         </menu>
       </toolitem>
       <separator/>
-#if !EXPRESS
       <toolitem action='mail-print'/>
-#endif
       <toolitem action='mail-delete'/>
       <toolitem action='mail-mark-junk'/>
       <toolitem action='mail-mark-notjunk'/>
     </placeholder>
     <separator/>
     <placeholder name='mail-toolbar-navigation'>
-#if !EXPRESS
       <toolitem action='mail-previous'/>
       <toolitem action='mail-next'/>
-#endif
     </placeholder>
   </toolbar>
   <popup name='mail-message-popup'>
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'/>
diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
index 7a30947060..3a5c2eca82 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -2,18 +2,14 @@
   <menubar name='main-menu'>
     <menu action='file-menu'>
       <menu action='new-menu'/>
-#if !EXPRESS
       <menuitem action='new-window'/>
-#endif
       <separator/>
       <placeholder name='mail-send-receiver'/>
       <placeholder name='file-actions'/>
       <separator/>
       <menuitem action='import'/>
-#if !EXPRESS
       <separator/>
       <menuitem action='page-setup'/>
-#endif
       <placeholder name='print-actions'/>
       <separator/>
       <placeholder name='long-running-actions'/>
@@ -45,16 +41,13 @@
         <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'/>
@@ -63,7 +56,6 @@
         <separator/>
         <menuitem action='show-switcher'/>
       </menu>
-#endif
     </menu>
     <placeholder name='custom-menus'/>
     <menu action='search-menu'>