diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-03-16 02:37:56 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-03-16 02:39:14 +0800 |
| commit | ba8f7c993e23e5b5f47100b04341e51e4f579919 (patch) | |
| tree | 0fc556c08de9f89284a18b958c3765264b0a3e1f /shell | |
| parent | 8bb20047d9d785c08387cd26fb13b3c8de9ce5a2 (diff) | |
| download | gsoc2013-evolution-ba8f7c993e23e5b5f47100b04341e51e4f579919.tar.gz gsoc2013-evolution-ba8f7c993e23e5b5f47100b04341e51e4f579919.tar.zst gsoc2013-evolution-ba8f7c993e23e5b5f47100b04341e51e4f579919.zip | |
Bug 612916 - e_lookup_action() called too early during initialization
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/e-shell-window-private.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c index 159a6b17d3..c4389ab3bc 100644 --- a/shell/e-shell-window-private.c +++ b/shell/e-shell-window-private.c @@ -280,8 +280,6 @@ e_shell_window_private_constructed (EShellWindow *shell_window) shell = e_shell_window_get_shell (shell_window); shell_settings = e_shell_get_shell_settings (shell); - e_shell_watch_window (shell, window); - ui_manager = e_shell_window_get_ui_manager (shell_window); e_shell_configure_ui_manager (shell, E_UI_MANAGER (ui_manager)); @@ -289,6 +287,10 @@ e_shell_window_private_constructed (EShellWindow *shell_window) e_shell_window_actions_init (shell_window); + /* Do this after intializing actions because it + * triggers shell_window_update_close_action_cb(). */ + e_shell_watch_window (shell, window); + accel_group = gtk_ui_manager_get_accel_group (ui_manager); gtk_window_add_accel_group (GTK_WINDOW (shell_window), accel_group); |