From ba8f7c993e23e5b5f47100b04341e51e4f579919 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 15 Mar 2010 14:37:56 -0400 Subject: Bug 612916 - e_lookup_action() called too early during initialization --- shell/e-shell-window-private.c | 6 ++++-- 1 file 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); -- cgit v1.2.3