aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/gui
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-03-31 21:58:52 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-04-01 00:10:54 +0800
commit0494d4c3c67403293c496d0ab6ce498b954a8a06 (patch)
tree845fb73df494c60b39132fc6bbb1c1358f46ba54 /calendar/gui
parent0125093ff7f0883fd8b97176a18cac5e798a37b9 (diff)
downloadgsoc2013-evolution-0494d4c3c67403293c496d0ab6ce498b954a8a06.tar
gsoc2013-evolution-0494d4c3c67403293c496d0ab6ce498b954a8a06.tar.gz
gsoc2013-evolution-0494d4c3c67403293c496d0ab6ce498b954a8a06.tar.bz2
gsoc2013-evolution-0494d4c3c67403293c496d0ab6ce498b954a8a06.tar.lz
gsoc2013-evolution-0494d4c3c67403293c496d0ab6ce498b954a8a06.tar.xz
gsoc2013-evolution-0494d4c3c67403293c496d0ab6ce498b954a8a06.tar.zst
gsoc2013-evolution-0494d4c3c67403293c496d0ab6ce498b954a8a06.zip
Remove EUIManager.
No longer needed. Use GtkUIManager directly.
Diffstat (limited to 'calendar/gui')
-rw-r--r--calendar/gui/dialogs/comp-editor.c6
-rw-r--r--calendar/gui/dialogs/event-editor.c2
2 files changed, 3 insertions, 5 deletions
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index f269cf226b..77477c319d 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -2030,9 +2030,7 @@ comp_editor_init (CompEditor *editor)
priv->is_group_item = FALSE;
priv->saved = FALSE;
- priv->ui_manager = e_ui_manager_new ();
- e_ui_manager_set_express_mode (
- E_UI_MANAGER (priv->ui_manager), express_mode);
+ priv->ui_manager = gtk_ui_manager_new ();
gtk_window_add_accel_group (
GTK_WINDOW (editor),
@@ -2142,7 +2140,7 @@ comp_editor_init (CompEditor *editor)
action = comp_editor_get_action (editor, "save");
gtk_action_set_sensitive (action, FALSE);
- e_ui_manager_add_ui_from_string (E_UI_MANAGER (priv->ui_manager), ui, &error);
+ gtk_ui_manager_add_ui_from_string (priv->ui_manager, ui, -1, &error);
if (error != NULL) {
g_warning ("%s: %s", G_STRFUNC, error->message);
g_error_free (error);
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 81517c3cdd..16f83d1e84 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -559,7 +559,7 @@ event_editor_init (EventEditor *ee)
G_N_ELEMENTS (meeting_entries), ee);
ui_manager = comp_editor_get_ui_manager (editor);
- e_ui_manager_add_ui_from_string (E_UI_MANAGER (ui_manager), ui, &error);
+ gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, &error);
id = "org.gnome.evolution.event-editor";
e_plugin_ui_register_manager (ui_manager, id, ee);