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