[nautilus] navigation-window: initialize actions before setting up the pane

[Cosimo Cecchi <cosimoc src gnome org>]

commit 80ea58e844365d0bb097436ed8c0359e07cfd793
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Thu Feb 10 10:46:27 2011 -0500

    navigation-window: initialize actions before setting up the pane
    
    This is needed so that the pane can use those actions to build the
    toolbar. We also have to remove the code that updates split view
    actions from _initialize_actions(), as it requires the pane is realized.
    It should not be much of an issue, as that code is called when loading
    an URI anyway (and so it is called afterwards when loading the window).

 src/nautilus-navigation-window-menus.c |    2 --
 src/nautilus-navigation-window.c       |    3 +--
 2 files changed, 1 insertions(+), 4 deletions(-)
---
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index 9e4ba55..e4fe695 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -956,8 +956,6 @@ nautilus_navigation_window_initialize_actions (NautilusNavigationWindow *window)
 	g_signal_connect (window, "loading_uri",
 			  G_CALLBACK (nautilus_navigation_window_update_split_view_actions_sensitivity),
 			  NULL);
-
-	nautilus_navigation_window_update_split_view_actions_sensitivity (window);
 }
 
 static void
diff --git a/src/nautilus-navigation-window.c b/src/nautilus-navigation-window.c
index c39acce..bb23136 100644
--- a/src/nautilus-navigation-window.c
+++ b/src/nautilus-navigation-window.c
@@ -839,6 +839,7 @@ nautilus_navigation_window_init (NautilusNavigationWindow *window)
 	gtk_box_pack_start (GTK_BOX (vbox), win->details->statusbar, FALSE, FALSE, 0);
 	gtk_widget_show (win->details->statusbar);
 
+	nautilus_navigation_window_initialize_actions (window);
 	nautilus_navigation_window_pane_setup (pane);
 
 	gtk_paned_pack1 (GTK_PANED(hpaned), pane->widget, TRUE, FALSE);
@@ -848,8 +849,6 @@ nautilus_navigation_window_init (NautilusNavigationWindow *window)
 	 * but before menu stuff is being called */
 	nautilus_window_set_active_pane (win, NAUTILUS_WINDOW_PANE (pane));
 
-	nautilus_navigation_window_initialize_actions (window);
-
 	nautilus_navigation_window_initialize_menus (window);
 
 #if 0