[evolution/express2] cleanup for non-express mode

[Michael Meeks <michael src gnome org>]

commit bdca2cc8856b9ac65dc7805879b07383bb639494
Author: Michael Meeks <michael meeks novell com>
Date:   Thu Apr 15 13:38:57 2010 +0100

    cleanup for non-express mode

 calendar/gui/dialogs/comp-editor.c |    8 +++++---
 calendar/gui/dialogs/task-editor.c |    6 ++++--
 2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index b59e159..e8acf21 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -177,9 +177,11 @@ static const gchar *ui =
 "    <toolitem action='print'/>\n"
 "#endif\n"
 "    <separator/>"
-"    <placeholder name='content'/>"
-"    <separator expand='true'/>"
-"    <toolitem action='close'/>"
+"    <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/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 7aaa3c5..7e35cbe 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -81,8 +81,10 @@ static const gchar *ui =
 "    </menu>"
 "  </menubar>"
 "  <toolbar name='main-toolbar'>"
-"    <toolitem action='view-time-zone'/>"
-"    <toolitem action='option-status'/>"
+"    <placeholder name='content'>"
+"      <toolitem action='view-time-zone'/>"
+"      <toolitem action='option-status'/>"
+"    </placeholder>"
 "  </toolbar>"
 "</ui>";