Alter UI conditional syntax to be more familiar cpp style, which

avoids the need for intltool changes.

4 files changed, 28 insertions, 28 deletions

diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
index d3ef98a75b..8cc6bf2f91 100644
--- a/ui/evolution-calendars.ui
+++ b/ui/evolution-calendars.ui
@@ -28,33 +28,33 @@
     </placeholder>
   </menubar>
   <toolbar name='main-toolbar'>
-<!-- if !EXPRESS -->		  
+#if !EXPRESS
     <toolitem action='calendar-print'/>
     <toolitem action='delete-selection'/>
     <separator/>
-<!-- endif -->    
+#endif
     <toolitem action='calendar-go-back'/>
     <toolitem action='calendar-go-today'/>
     <toolitem action='calendar-go-forward'/>
-<!-- if !EXPRESS -->		      
+#if !EXPRESS
     <separator/>
     <toolitem action='calendar-jump-to'/>
-<!-- endif -->        
+#endif
     <separator/>
     <toolitem action='calendar-view-day'/>
     <toolitem action='calendar-view-workweek'/>
-<!-- if !EXPRESS -->		      
+#if !EXPRESS
     <toolitem action='calendar-view-week'/>
-<!-- endif -->    
+#endif
 
     <toolitem action='calendar-view-month'/>
-<!-- if !EXPRESS -->		      
+#if !EXPRESS
     <toolitem action='calendar-view-list'/>
-<!-- endif -->    
-<!-- if EXPRESS -->
+#endif
+#if EXPRESS
     <separator expand="true"/>
     <toolitem action='quit-calendar'/>
-<!-- endif -->    
+#endif
 
   </toolbar>
   <popup name='calendar-popup'>
diff --git a/ui/evolution-mail-reader.ui b/ui/evolution-mail-reader.ui
index 4ca9522e88..ad0b401676 100644
--- a/ui/evolution-mail-reader.ui
+++ b/ui/evolution-mail-reader.ui
@@ -25,10 +25,10 @@
       <separator/>
       <placeholder name='mail-message-view-actions'>
         <menuitem action='mail-load-images'/>
-<!-- if !EXPRESS -->
+#if !EXPRESS
         <menuitem action='mail-show-all-headers'/>
         <menuitem action='mail-caret-mode'/>
-<!-- endif -->
+#endif
         <menuitem action='mail-show-source'/>
         <menu action='mail-zoom-menu'>
           <menuitem action='mail-zoom-in'/>
@@ -122,19 +122,19 @@
         </menu>
       </toolitem>
       <separator/>
-<!-- if !EXPRESS -->
+#if !EXPRESS
       <toolitem action='mail-print'/>
-<!-- endif -->
+#endif
       <toolitem action='mail-delete'/>
       <toolitem action='mail-mark-junk'/>
       <toolitem action='mail-mark-notjunk'/>
     </placeholder>
     <separator/>
     <placeholder name='mail-toolbar-navigation'>
-<!-- if !EXPRESS -->
+#if !EXPRESS
       <toolitem action='mail-previous'/>
       <toolitem action='mail-next'/>
-<!-- endif -->
+#endif
     </placeholder>
   </toolbar>
   <popup name='mail-message-popup'>
diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui
index 6110b8d124..849d579eb6 100644
--- a/ui/evolution-mail.ui
+++ b/ui/evolution-mail.ui
@@ -61,21 +61,21 @@
     </menu>
   </menubar>
   <toolbar name='main-toolbar'>
-<!-- if EXPRESS -->
+#if EXPRESS
     <placeholder name='toolbar-actions'>
       <toolitem action='new-addressbook-window'/>
     </placeholder>
-<!-- endif -->
+#endif
     <placeholder name='mail-toolbar-common'/>
-<!-- if !EXPRESS -->
+#if !EXPRESS
     <toolitem action='mail-stop'/>
-<!-- endif -->
+#endif
     <separator/>
     <placeholder name='mail-toolbar-navigation'/>
-<!-- if EXPRESS -->
+#if EXPRESS
     <separator/>
     <toolitem action='preferences'/>
-<!-- endif -->
+#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 dfa6e761f0..2407260649 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -2,9 +2,9 @@
   <menubar name='main-menu'>
     <menu action='file-menu'>
       <menu action='new-menu'/>
-<!-- if !EXPRESS -->
+#if !EXPRESS
       <menuitem action='new-window'/>
-<!-- endif -->
+#endif
       <separator/>
       <menuitem action='send-receive'/>
       <placeholder name='file-actions'/>
@@ -45,16 +45,16 @@
         <separator/>
         <menuitem action='gal-define-views'/>
       </menu>
-<!-- if !EXPRESS -->
+#if !EXPRESS
       <menu action='window-menu'/>
-<!-- endif -->
+#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 -->
+#if !EXPRESS
       <menu action='switcher-menu'>
         <menuitem action='switcher-style-both'/>
         <menuitem action='switcher-style-icons'/>
@@ -63,7 +63,7 @@
         <separator/>
         <menuitem action='show-switcher'/>
       </menu>
-<!-- endif -->
+#endif
     </menu>
     <placeholder name='custom-menus'/>
     <menu action='search-menu'>