diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-08-10 08:03:24 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-08-10 22:32:03 +0800 |
| commit | 45d475c31b2dbda8033021984ba9a429b9eddf51 (patch) | |
| tree | 04550583b657b0ea2e62f1a289631e9e03a8dbb1 /shell | |
| parent | 3b0699fc304d0f4aecb261d19869de221f5d6abf (diff) | |
| download | gsoc2013-evolution-45d475c31b2dbda8033021984ba9a429b9eddf51.tar gsoc2013-evolution-45d475c31b2dbda8033021984ba9a429b9eddf51.tar.gz gsoc2013-evolution-45d475c31b2dbda8033021984ba9a429b9eddf51.tar.bz2 gsoc2013-evolution-45d475c31b2dbda8033021984ba9a429b9eddf51.tar.lz gsoc2013-evolution-45d475c31b2dbda8033021984ba9a429b9eddf51.tar.xz gsoc2013-evolution-45d475c31b2dbda8033021984ba9a429b9eddf51.tar.zst gsoc2013-evolution-45d475c31b2dbda8033021984ba9a429b9eddf51.zip | |
Kill EMMenu and EMPopup.
Also finish adapting Templates plugin to EPluginUI.
It was still leaning pretty hard on EMPopup.
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/e-shell-window-private.c | 11 | ||||
| -rw-r--r-- | shell/e-shell-window.c | 11 |
2 files changed, 10 insertions, 12 deletions
diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c index 71617433d1..1eb5eed460 100644 --- a/shell/e-shell-window-private.c +++ b/shell/e-shell-window-private.c @@ -212,6 +212,8 @@ e_shell_window_private_init (EShellWindow *shell_window) merge_id = gtk_ui_manager_new_merge_id (priv->ui_manager); priv->gal_view_merge_id = merge_id; + gtk_window_set_title (GTK_WINDOW (shell_window), _("Evolution")); + e_shell_window_actions_init (shell_window); accel_group = gtk_ui_manager_get_accel_group (priv->ui_manager); @@ -335,10 +337,12 @@ e_shell_window_private_constructed (EShellWindow *shell_window) EShellSettings *shell_settings; EShell *shell; GConfBridge *bridge; - GtkActionGroup *action_group; GtkAction *action; + GtkActionGroup *action_group; + GtkUIManager *ui_manager; GObject *object; const gchar *key; + const gchar *id; shell = e_shell_window_get_shell (shell_window); shell_settings = e_shell_get_shell_settings (shell); @@ -427,6 +431,11 @@ e_shell_window_private_constructed (EShellWindow *shell_window) gconf_bridge_bind_property (bridge, key, object, "active"); shell_window_init_switcher_style (shell_window); + + id = "org.gnome.evolution.shell"; + ui_manager = e_shell_window_get_ui_manager (shell_window); + e_plugin_ui_register_manager (ui_manager, id, shell_window); + e_plugin_ui_enable_manager (ui_manager, id); } void diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index c838235616..19392094ee 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -335,20 +335,9 @@ shell_window_class_init (EShellWindowClass *class) static void shell_window_init (EShellWindow *shell_window) { - GtkUIManager *ui_manager; - const gchar *id; - shell_window->priv = E_SHELL_WINDOW_GET_PRIVATE (shell_window); - gtk_window_set_title (GTK_WINDOW (shell_window), _("Evolution")); - e_shell_window_private_init (shell_window); - - ui_manager = e_shell_window_get_ui_manager (shell_window); - - id = "org.gnome.evolution.shell"; - e_plugin_ui_register_manager (ui_manager, id, shell_window); - e_plugin_ui_enable_manager (ui_manager, id); } GType |