diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-03-16 00:11:26 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-03-16 00:14:36 +0800 |
| commit | 04305b8fa35d87d97e48b11f93d24604cef5155d (patch) | |
| tree | 5bb4922a88238522039431aa4d3583777d1f3466 /calendar | |
| parent | 2971ce413ce9f91ac768d53487c47056b2f5710f (diff) | |
| download | gsoc2013-evolution-04305b8fa35d87d97e48b11f93d24604cef5155d.tar gsoc2013-evolution-04305b8fa35d87d97e48b11f93d24604cef5155d.tar.gz gsoc2013-evolution-04305b8fa35d87d97e48b11f93d24604cef5155d.tar.bz2 gsoc2013-evolution-04305b8fa35d87d97e48b11f93d24604cef5155d.tar.lz gsoc2013-evolution-04305b8fa35d87d97e48b11f93d24604cef5155d.tar.xz gsoc2013-evolution-04305b8fa35d87d97e48b11f93d24604cef5155d.tar.zst gsoc2013-evolution-04305b8fa35d87d97e48b11f93d24604cef5155d.zip | |
Revert some bad assumptions I made in EPluginUI.
We can't require the use of EUIManager everywhere because we don't
control all the UI manager instances -- the most compelling example
being the composer, whose UI manager comes from GtkhtmlEditor.
Instead, EPluginUI will check the instance type and pick an appropriate
"load_from_string" function.
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/gui/dialogs/event-editor.c | 4 | ||||
| -rw-r--r-- | calendar/gui/dialogs/memo-editor.c | 4 | ||||
| -rw-r--r-- | calendar/gui/dialogs/task-editor.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c index 6e8b049bee..23256adff0 100644 --- a/calendar/gui/dialogs/event-editor.c +++ b/calendar/gui/dialogs/event-editor.c @@ -507,8 +507,8 @@ event_editor_init (EventEditor *ee) gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, &error); id = "org.gnome.evolution.event-editor"; - e_plugin_ui_register_manager (E_UI_MANAGER (ui_manager), id, ee); - e_plugin_ui_enable_manager (E_UI_MANAGER (ui_manager), id); + e_plugin_ui_register_manager (ui_manager, id, ee); + e_plugin_ui_enable_manager (ui_manager, id); if (error != NULL) { g_critical ("%s: %s", G_STRFUNC, error->message); diff --git a/calendar/gui/dialogs/memo-editor.c b/calendar/gui/dialogs/memo-editor.c index 8e2a5619dd..8e988c00a5 100644 --- a/calendar/gui/dialogs/memo-editor.c +++ b/calendar/gui/dialogs/memo-editor.c @@ -143,8 +143,8 @@ memo_editor_init (MemoEditor *me) gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, &error); id = "org.gnome.evolution.memo-editor"; - e_plugin_ui_register_manager (E_UI_MANAGER (ui_manager), id, me); - e_plugin_ui_enable_manager (E_UI_MANAGER (ui_manager), id); + e_plugin_ui_register_manager (ui_manager, id, me); + e_plugin_ui_enable_manager (ui_manager, id); if (error != NULL) { g_critical ("%s: %s", G_STRFUNC, error->message); diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c index c7e0440eda..a3d4baec46 100644 --- a/calendar/gui/dialogs/task-editor.c +++ b/calendar/gui/dialogs/task-editor.c @@ -365,8 +365,8 @@ task_editor_init (TaskEditor *te) gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, &error); id = "org.gnome.evolution.task-editor"; - e_plugin_ui_register_manager (E_UI_MANAGER (ui_manager), id, te); - e_plugin_ui_enable_manager (E_UI_MANAGER (ui_manager), id); + e_plugin_ui_register_manager (ui_manager, id, te); + e_plugin_ui_enable_manager (ui_manager, id); if (error != NULL) { g_critical ("%s: %s", G_STRFUNC, error->message); |