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.

---
 modules/calendar/e-cal-shell-view.c | 4 ----
 ui/evolution-calendars.ui           | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/modules/calendar/e-cal-shell-view.c b/modules/calendar/e-cal-shell-view.c
index 2ce3ac3f0d..b845fc68d6 100644
--- a/modules/calendar/e-cal-shell-view.c
+++ b/modules/calendar/e-cal-shell-view.c
@@ -491,10 +491,6 @@ cal_shell_view_class_init (ECalShellViewClass *class,
 	shell_view_class->new_shell_sidebar = e_cal_shell_sidebar_new;
 	shell_view_class->execute_search = cal_shell_view_execute_search;
 	shell_view_class->update_actions = cal_shell_view_update_actions;
-	
-	if(e_shell_get_express_mode(e_shell_get_default()))
-		shell_view_class->construct_searchbar = NULL;
-
 }	
 
 static void
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