From 077c7326355dd2881e3a4686ccdf4c2a7446df4f Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@novell.com>
Date: Wed, 24 Mar 2010 09:56:20 +0000
Subject: Alter UI conditional syntax to be more familiar cpp style, which
 avoids the need for intltool changes.

---
 ui/evolution-mail-reader.ui | 12 ++++++------
 ui/evolution-mail.ui        | 12 ++++++------
 ui/evolution-shell.ui       | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'ui')

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'>
-- 
cgit v1.2.3


From 4cc6bd4673115dff52a403d31e9613deea402d0e Mon Sep 17 00:00:00 2001
From: Srinivasa Ragavan <sragavan@gnome.org>
Date: Fri, 19 Mar 2010 22:41:25 +0530
Subject: Redo Calendar for express mode. Just design/layout changes.

---
 ui/evolution-calendars.ui | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'ui')

diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
index feef83de6c..d3ef98a75b 100644
--- a/ui/evolution-calendars.ui
+++ b/ui/evolution-calendars.ui
@@ -28,20 +28,34 @@
     </placeholder>
   </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 expand="true"/>
+    <toolitem action='quit-calendar'/>
+<!-- endif -->    
+
   </toolbar>
   <popup name='calendar-popup'>
     <menuitem action='calendar-new'/>
-- 
cgit v1.2.3


From a8333818241c60c0c111e7b7ac68ca80ec8fdb5d Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@novell.com>
Date: Tue, 23 Mar 2010 10:24:31 +0000
Subject: Alter UI conditional syntax to be more familiar cpp style, which
 avoids the need for intltool changes.

---
 ui/evolution-calendars.ui | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'ui')

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'>
-- 
cgit v1.2.3


From d9fb3008135d71dcbc512325087aceb19016ace7 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Fri, 26 Mar 2010 22:33:00 +0000
Subject: Simplify the search UI for express mode.

For express mode:

- Move the search bar up to the toolbar.

- Hide the "filter" combo box and lock down the first item.

- Hide the "scope" combo box and lock down the first item.
  (This is the combo box with "Current Folder" only in the mailer.)

- EShellView owns the search bar widget now instead of EShellContent.

- Insert several nasty hacks that will likely come back to bite me.

Conflicts:

	doc/reference/shell/eshell-sections.txt
---
 ui/evolution-shell.ui | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ui')

diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
index 2407260649..fc41ed17e2 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -93,4 +93,5 @@
     <separator/>
     <placeholder name='toolbar-actions'/>
   </toolbar>
+  <toolbar name='search-toolbar'/>
 </ui>
-- 
cgit v1.2.3


From 99b11b37ddf25706b3baadcecbc0b54df437e0d8 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sun, 28 Mar 2010 08:41:22 -0400
Subject: Only show "Send/Receive" in mailer when using express mode.

---
 ui/evolution-calendars.ui |  2 ++
 ui/evolution-contacts.ui  |  4 ++++
 ui/evolution-mail.ui      |  6 ++++--
 ui/evolution-memos.ui     | 18 ++++++++++--------
 ui/evolution-shell.ui     |  2 --
 ui/evolution-tasks.ui     |  4 ++++
 6 files changed, 24 insertions(+), 12 deletions(-)

(limited to 'ui')

diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
index 8cc6bf2f91..bf4910328d 100644
--- a/ui/evolution-calendars.ui
+++ b/ui/evolution-calendars.ui
@@ -29,6 +29,8 @@
   </menubar>
   <toolbar name='main-toolbar'>
 #if !EXPRESS
+    <toolitem action='send-receive'/>
+    <separator/>
     <toolitem action='calendar-print'/>
     <toolitem action='delete-selection'/>
     <separator/>
diff --git a/ui/evolution-contacts.ui b/ui/evolution-contacts.ui
index 11dc1f20d0..aeb6c7998c 100644
--- a/ui/evolution-contacts.ui
+++ b/ui/evolution-contacts.ui
@@ -46,6 +46,10 @@
     </placeholder>
   </menubar>
   <toolbar name='main-toolbar'>
+#if !EXPRESS
+    <toolitem action='send-receive'/>
+    <separator/>
+#endif
     <toolitem action='address-book-print'/>
     <toolitem action='delete-selection'/>
     <toolitem action='address-book-stop'/>
diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui
index 849d579eb6..d0c305197a 100644
--- a/ui/evolution-mail.ui
+++ b/ui/evolution-mail.ui
@@ -61,11 +61,13 @@
     </menu>
   </menubar>
   <toolbar name='main-toolbar'>
-#if EXPRESS
     <placeholder name='toolbar-actions'>
+      <toolitem action='send-receive'/>
+      <separator/>
+#if EXPRESS
       <toolitem action='new-addressbook-window'/>
-    </placeholder>
 #endif
+    </placeholder>
     <placeholder name='mail-toolbar-common'/>
 #if !EXPRESS
     <toolitem action='mail-stop'/>
diff --git a/ui/evolution-memos.ui b/ui/evolution-memos.ui
index dbe42c7714..b204605ab9 100644
--- a/ui/evolution-memos.ui
+++ b/ui/evolution-memos.ui
@@ -29,14 +29,16 @@
     </menu>
   </menubar>
   <toolbar name='main-toolbar'>
-    <placeholder name='toolbar-actions'>
-      <toolitem action='cut-clipboard'/>
-      <toolitem action='copy-clipboard'/>
-      <toolitem action='paste-clipboard'/>
-      <separator/>
-      <toolitem action='memo-list-print'/>
-      <toolitem action='delete-selection'/>
-    </placeholder>
+#if !EXPRESS
+    <toolitem action='send-receive'/>
+    <separator/>
+#endif
+    <toolitem action='cut-clipboard'/>
+    <toolitem action='copy-clipboard'/>
+    <toolitem action='paste-clipboard'/>
+    <separator/>
+    <toolitem action='memo-list-print'/>
+    <toolitem action='delete-selection'/>
   </toolbar>
   <popup name='memo-popup'>
     <menuitem action='memo-new'/>
diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
index fc41ed17e2..30bd8c6080 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -89,8 +89,6 @@
     </menu>
   </menubar>
   <toolbar name='main-toolbar'>
-    <toolitem action='send-receive'/>
-    <separator/>
     <placeholder name='toolbar-actions'/>
   </toolbar>
   <toolbar name='search-toolbar'/>
diff --git a/ui/evolution-tasks.ui b/ui/evolution-tasks.ui
index 62d9f023b7..8993e5c43a 100644
--- a/ui/evolution-tasks.ui
+++ b/ui/evolution-tasks.ui
@@ -39,6 +39,10 @@
     </placeholder>
   </menubar>
   <toolbar name='main-toolbar'>
+#if !EXPRESS
+    <toolitem action='send-receive'/>
+    <separator/>
+#endif
     <toolitem action='cut-clipboard'/>
     <toolitem action='copy-clipboard'/>
     <toolitem action='paste-clipboard'/>
-- 
cgit v1.2.3


From 28bf4aa38a9a1e7796caf6fa6ebc1f5a1c470848 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@novell.com>
Date: Fri, 26 Mar 2010 22:55:12 +0000
Subject: Get the new contact sizing right despite the scrolled regions. Add
 Claire's calendar popup feedback wrt. express mode

---
 ui/evolution-calendars.ui | 16 ++++++++++++++++
 ui/evolution-contacts.ui  |  4 +++-
 2 files changed, 19 insertions(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
index bf4910328d..f38fa2e7d3 100644
--- a/ui/evolution-calendars.ui
+++ b/ui/evolution-calendars.ui
@@ -5,8 +5,10 @@
         <menuitem action='event-open'/>
       </placeholder>
       <placeholder name='print-actions'>
+#if !EXPRESS
         <menuitem action='calendar-print-preview'/>
         <menuitem action='calendar-print'/>
+#endif
       </placeholder>
     </menu>
     <menu action='edit-menu'>
@@ -75,12 +77,15 @@
     <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'/>
@@ -92,24 +97,31 @@
     </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'/>
@@ -124,7 +136,9 @@
     <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'/>
@@ -140,7 +154,9 @@
     <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 aeb6c7998c..77061bb010 100644
--- a/ui/evolution-contacts.ui
+++ b/ui/evolution-contacts.ui
@@ -7,8 +7,10 @@
         <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'>
@@ -49,8 +51,8 @@
 #if !EXPRESS
     <toolitem action='send-receive'/>
     <separator/>
-#endif
     <toolitem action='address-book-print'/>
+#endif
     <toolitem action='delete-selection'/>
     <toolitem action='address-book-stop'/>
   </toolbar>
-- 
cgit v1.2.3


From d2a6ea99cb4e00a2316e224b844c0ef3989fd9c5 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@novell.com>
Date: Mon, 29 Mar 2010 17:21:00 +0100
Subject: remove redundant print elements from express mode

---
 ui/evolution-contacts.ui | 2 ++
 ui/evolution-shell.ui    | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'ui')

diff --git a/ui/evolution-contacts.ui b/ui/evolution-contacts.ui
index 77061bb010..a258060184 100644
--- a/ui/evolution-contacts.ui
+++ b/ui/evolution-contacts.ui
@@ -72,7 +72,9 @@
     <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-shell.ui b/ui/evolution-shell.ui
index 30bd8c6080..5e249daa2e 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -10,8 +10,10 @@
       <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'/>
-- 
cgit v1.2.3


From b9a0dc4021e9d3ff8a171a0249dc3a1b8ce491cd Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@novell.com>
Date: Wed, 14 Apr 2010 21:03:10 +0100
Subject: remove custom close / searchbar hiding hacks for express mode, use
 the new / stock shell versions now.

---
 ui/evolution-calendars.ui | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'ui')

diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
index f38fa2e7d3..404101910b 100644
--- a/ui/evolution-calendars.ui
+++ b/ui/evolution-calendars.ui
@@ -55,10 +55,6 @@
 #if !EXPRESS
     <toolitem action='calendar-view-list'/>
 #endif
-#if EXPRESS
-    <separator expand="true"/>
-    <toolitem action='quit-calendar'/>
-#endif
 
   </toolbar>
   <popup name='calendar-popup'>
-- 
cgit v1.2.3


From 43e2c871a418b560b391af00df2b10896055026c Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 22 Apr 2010 18:28:17 -0400
Subject: Work around another dropped gnome-icon-theme icon.

mail-mark-notjunk -> mail-mark-not-junk
---
 ui/evolution-mail-reader.ui | 4 ++--
 ui/evolution-mail.ui        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'ui')

diff --git a/ui/evolution-mail-reader.ui b/ui/evolution-mail-reader.ui
index ad0b401676..53cb8845d3 100644
--- a/ui/evolution-mail-reader.ui
+++ b/ui/evolution-mail-reader.ui
@@ -82,7 +82,7 @@
           <menuitem action="mail-mark-unimportant"/>
           <separator/>
           <menuitem action="mail-mark-junk"/>
-          <menuitem action="mail-mark-notjunk"/>
+          <menuitem action="mail-mark-not-junk"/>
           <separator/>
           <menuitem action="mail-flag-for-followup"/>
           <menuitem action="mail-flag-clear"/>
@@ -127,7 +127,7 @@
 #endif
       <toolitem action='mail-delete'/>
       <toolitem action='mail-mark-junk'/>
-      <toolitem action='mail-mark-notjunk'/>
+      <toolitem action='mail-mark-not-junk'/>
     </placeholder>
     <separator/>
     <placeholder name='mail-toolbar-navigation'>
diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui
index d0c305197a..bae4b26fe2 100644
--- a/ui/evolution-mail.ui
+++ b/ui/evolution-mail.ui
@@ -111,7 +111,7 @@
     <menuitem action='mail-popup-mark-important'/>
     <menuitem action='mail-popup-mark-unimportant'/>
     <menuitem action='mail-popup-mark-junk'/>
-    <menuitem action='mail-popup-mark-notjunk'/>
+    <menuitem action='mail-popup-mark-not-junk'/>
     <menuitem action='mail-popup-flag-for-followup'/>
     <menuitem action="mail-popup-flag-clear"/>
     <menuitem action="mail-popup-flag-completed"/>
-- 
cgit v1.2.3


From ac73bb166c4227a02c703697d906b78569ebadb1 Mon Sep 17 00:00:00 2001
From: Srinivasa Ragavan <sragavan@gnome.org>
Date: Fri, 30 Apr 2010 09:42:11 +0530
Subject: Show preferences toolbutton on the calendar view.

---
 ui/evolution-calendars.ui | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'ui')

diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
index 404101910b..cbffb867b0 100644
--- a/ui/evolution-calendars.ui
+++ b/ui/evolution-calendars.ui
@@ -55,6 +55,10 @@
 #if !EXPRESS
     <toolitem action='calendar-view-list'/>
 #endif
+#if EXPRESS
+    <separator/>
+    <toolitem action='preferences'/>
+#endif
 
   </toolbar>
   <popup name='calendar-popup'>
-- 
cgit v1.2.3


From bde1bc6bca4c5ed63a193f7dc50252e550a0fb40 Mon Sep 17 00:00:00 2001
From: Srinivasa Ragavan <sragavan@gnome.org>
Date: Tue, 11 May 2010 18:47:09 +0530
Subject: Handle adding 'X' close button on the menu bar. Restore adding the
 same for adding in calendar since it doesn't have a toolbar.

---
 ui/evolution-calendars.ui | 7 ++++++-
 ui/evolution-shell.ui     | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
index cbffb867b0..8bd41d4bb1 100644
--- a/ui/evolution-calendars.ui
+++ b/ui/evolution-calendars.ui
@@ -59,7 +59,12 @@
     <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'/>
diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
index 5e249daa2e..c16189932e 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -94,4 +94,6 @@
     <placeholder name='toolbar-actions'/>
   </toolbar>
   <toolbar name='search-toolbar'/>
+  <toolbar name='close-toolbar'/>
+
 </ui>
-- 
cgit v1.2.3