From 15fbc1654e16f3d2a4c6b55b01dc2a76596b07ba Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sun, 31 Mar 2013 09:37:31 -0400
Subject: Remove conditionals from GtkUIManager definitions.

---
 calendar/gui/dialogs/comp-editor.c  | 6 ------
 calendar/gui/dialogs/event-editor.c | 6 ------
 2 files changed, 12 deletions(-)

(limited to 'calendar')

diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 16d49fdb52..f269cf226b 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -178,15 +178,9 @@ static const gchar *ui =
 "  <toolbar name='main-toolbar'>"
 "    <toolitem action='save-and-close'/>\n"
 "    <toolitem action='save'/>\n"
-"#if !EXPRESS\n"
 "    <toolitem action='print'/>\n"
-"#endif\n"
 "    <separator/>"
 "    <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/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 2ea6297dcc..81517c3cdd 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -85,17 +85,11 @@ static const gchar *ui =
 "  </menubar>"
 "  <toolbar name='main-toolbar'>"
 "    <placeholder name='content'>\n"
-"#if !EXPRESS\n"
 "      <toolitem action='alarms'/>\n"
-"#endif\n"
 "      <toolitem action='show-time-busy'/>\n"
-"#if !EXPRESS\n"
 "      <toolitem action='recurrence'/>\n"
-"#endif\n"
 "      <toolitem action='all-day-event'/>\n"
-"#if !EXPRESS\n"
 "      <toolitem action='free-busy'/>\n"
-"#endif\n"
 "    </placeholder>"
 "  </toolbar>"
 "</ui>";
-- 
cgit v1.2.3