From 5fca5b574ef9831ff6a789b45f7d37746739e358 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@novell.com>
Date: Thu, 15 Apr 2010 13:32:34 +0100
Subject: Adapt the event editor for MeeGo / small-screen. Bin the menu bar,
 disable the print icon, add a close button at top right.

---
 calendar/gui/dialogs/event-editor.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'calendar/gui/dialogs/event-editor.c')

diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 1a5f6d67fd..8ca6605ee4 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -36,6 +36,7 @@
 #include <e-util/e-binding.h>
 #include <e-util/e-plugin-ui.h>
 #include <e-util/e-util-private.h>
+#include <e-util/e-ui-manager.h>
 
 #include "event-page.h"
 #include "recurrence-page.h"
@@ -89,11 +90,13 @@ static const gchar *ui =
 "    </menu>"
 "  </menubar>"
 "  <toolbar name='main-toolbar'>"
-"    <toolitem action='alarms'/>"
-"    <toolitem action='show-time-busy'/>"
-"    <toolitem action='recurrence'/>"
-"    <toolitem action='all-day-event'/>"
-"    <toolitem action='free-busy'/>"
+"    <placeholder name='content'>"
+"      <toolitem action='alarms'/>"
+"      <toolitem action='show-time-busy'/>"
+"      <toolitem action='recurrence'/>"
+"      <toolitem action='all-day-event'/>"
+"      <toolitem action='free-busy'/>"
+"    </placeholder>"
 "  </toolbar>"
 "</ui>";
 
@@ -491,7 +494,7 @@ event_editor_init (EventEditor *ee)
 		G_N_ELEMENTS (meeting_entries), ee);
 
 	ui_manager = comp_editor_get_ui_manager (editor);
-	gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, &error);
+	e_ui_manager_add_ui_from_string (E_UI_MANAGER (ui_manager), ui, &error);
 
 	id = "org.gnome.evolution.event-editor";
 	e_plugin_ui_register_manager (ui_manager, id, ee);
-- 
cgit v1.2.3