diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-03-31 21:58:52 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-04-01 00:10:54 +0800 |
| commit | 0494d4c3c67403293c496d0ab6ce498b954a8a06 (patch) | |
| tree | 845fb73df494c60b39132fc6bbb1c1358f46ba54 /shell | |
| parent | 0125093ff7f0883fd8b97176a18cac5e798a37b9 (diff) | |
| download | gsoc2013-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 'shell')
| -rw-r--r-- | shell/e-shell-view.c | 4 | ||||
| -rw-r--r-- | shell/e-shell-window-actions.c | 4 | ||||
| -rw-r--r-- | shell/e-shell-window-private.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c index 77597d0595..2d876ff80c 100644 --- a/shell/e-shell-view.c +++ b/shell/e-shell-view.c @@ -719,8 +719,8 @@ shell_view_toggled (EShellView *shell_view) id = shell_view_class->ui_manager_id; if (view_is_active && priv->merge_id == 0) { - priv->merge_id = e_ui_manager_add_ui_from_file ( - E_UI_MANAGER (ui_manager), basename); + priv->merge_id = e_load_ui_manager_definition ( + ui_manager, basename); e_plugin_ui_enable_manager (ui_manager, id); } else if (!view_is_active && priv->merge_id != 0) { e_plugin_ui_disable_manager (ui_manager, id); diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c index 2b70a5eea2..0863c1bdcd 100644 --- a/shell/e-shell-window-actions.c +++ b/shell/e-shell-window-actions.c @@ -1283,8 +1283,8 @@ e_shell_window_actions_init (EShellWindow *shell_window) g_return_if_fail (E_IS_SHELL_WINDOW (shell_window)); ui_manager = e_shell_window_get_ui_manager (shell_window); - e_ui_manager_add_ui_from_file ( - E_UI_MANAGER (ui_manager), "evolution-shell.ui"); + + e_load_ui_manager_definition (ui_manager, "evolution-shell.ui"); /* Shell Actions */ action_group = ACTION_GROUP (SHELL); diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c index 69e3ff24ad..b3070a6bcf 100644 --- a/shell/e-shell-window-private.c +++ b/shell/e-shell-window-private.c @@ -220,7 +220,7 @@ e_shell_window_private_init (EShellWindow *shell_window) signal_handler_ids = g_array_new (FALSE, FALSE, sizeof (gulong)); - priv->ui_manager = e_ui_manager_new (); + priv->ui_manager = gtk_ui_manager_new (); priv->loaded_views = loaded_views; priv->signal_handler_ids = signal_handler_ids; |