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 /shell | |
| parent | 2971ce413ce9f91ac768d53487c47056b2f5710f (diff) | |
| download | gsoc2013-evolution-04305b8fa35d87d97e48b11f93d24604cef5155d.tar.gz 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 'shell')
| -rw-r--r-- | shell/e-shell-view.c | 5 | ||||
| -rw-r--r-- | shell/e-shell-window-private.c | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 33f7fe8d7c..537024a548 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -28,6 +28,7 @@ #include "e-util/e-util.h" #include "e-util/e-file-utils.h" #include "e-util/e-plugin-ui.h" +#include "e-util/e-ui-manager.h" #include "filter/e-rule-context.h" #include "e-shell-window-actions.h" @@ -596,10 +597,10 @@ shell_view_toggled (EShellView *shell_view) if (view_is_active && priv->merge_id == 0) { priv->merge_id = e_ui_manager_add_ui_from_file ( E_UI_MANAGER (ui_manager), basename); - e_plugin_ui_enable_manager (E_UI_MANAGER (ui_manager), id); + e_plugin_ui_enable_manager (ui_manager, id); } else if (!view_is_active && priv->merge_id != 0) { - e_plugin_ui_disable_manager (E_UI_MANAGER (ui_manager), id); + e_plugin_ui_disable_manager (ui_manager, id); gtk_ui_manager_remove_ui (ui_manager, priv->merge_id); priv->merge_id = 0; } diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c index e70e76673c..159a6b17d3 100644 --- a/shell/e-shell-window-private.c +++ b/shell/e-shell-window-private.c @@ -456,9 +456,8 @@ e_shell_window_private_constructed (EShellWindow *shell_window) shell_window_init_switcher_style (shell_window); id = "org.gnome.evolution.shell"; - e_plugin_ui_register_manager ( - E_UI_MANAGER (ui_manager), id, shell_window); - e_plugin_ui_enable_manager (E_UI_MANAGER (ui_manager), id); + e_plugin_ui_register_manager (ui_manager, id, shell_window); + e_plugin_ui_enable_manager (ui_manager, id); } void |