[nautilus] window: add nautilus_window_get_navigation_state()



commit 9384542c1821420c01962237d23e9716bc5a8404
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Jan 6 14:10:28 2012 +0100

    window: add nautilus_window_get_navigation_state()

 src/nautilus-window-menus.c |    5 +++--
 src/nautilus-window-pane.c  |    6 ++++--
 src/nautilus-window.c       |    8 ++++++++
 src/nautilus-window.h       |    3 +++
 4 files changed, 18 insertions(+), 4 deletions(-)
---
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index 8e8b001..6de4c29 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -1104,6 +1104,7 @@ static const GtkRadioActionEntry main_radio_entries[] = {
 GtkActionGroup *
 nautilus_window_create_toolbar_action_group (NautilusWindow *window)
 {
+	NautilusNavigationState *navigation_state;
 	GtkActionGroup *action_group;
 	GtkAction *action;
 
@@ -1151,8 +1152,8 @@ nautilus_window_create_toolbar_action_group (NautilusWindow *window)
 
 	g_object_unref (action);
 
-	nautilus_navigation_state_add_group (window->details->nav_state,
-					     action_group);
+	navigation_state = nautilus_window_get_navigation_state (window);
+	nautilus_navigation_state_add_group (navigation_state, action_group);
 
 	return action_group;
 }
diff --git a/src/nautilus-window-pane.c b/src/nautilus-window-pane.c
index 11009d5..e540560 100644
--- a/src/nautilus-window-pane.c
+++ b/src/nautilus-window-pane.c
@@ -593,9 +593,11 @@ static void
 real_set_active (NautilusWindowPane *pane,
 		 gboolean is_active)
 {
+	NautilusNavigationState *nav_state;
+
 	if (is_active) {
-		nautilus_navigation_state_set_master (pane->window->details->nav_state,
-						      pane->action_group);
+		nav_state = nautilus_window_get_navigation_state (pane->window);
+		nautilus_navigation_state_set_master (nav_state, pane->action_group);
 	}
 
 	/* toolbar */
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index a9a6437..7a1917e 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -1599,6 +1599,14 @@ nautilus_window_get_main_action_group (NautilusWindow *window)
 	return window->details->main_action_group;
 }
 
+NautilusNavigationState *
+nautilus_window_get_navigation_state (NautilusWindow *window)
+{
+	g_return_val_if_fail (NAUTILUS_IS_WINDOW (window), NULL);
+
+	return window->details->nav_state;
+}
+
 NautilusWindowPane *
 nautilus_window_get_next_pane (NautilusWindow *window)
 {
diff --git a/src/nautilus-window.h b/src/nautilus-window.h
index 860303d..e743c7d 100644
--- a/src/nautilus-window.h
+++ b/src/nautilus-window.h
@@ -34,6 +34,7 @@
 #include <libnautilus-private/nautilus-bookmark.h>
 #include <libnautilus-private/nautilus-search-directory.h>
 
+#include "nautilus-navigation-state.h"
 #include "nautilus-view.h"
 #include "nautilus-window-types.h"
 
@@ -120,6 +121,8 @@ void             nautilus_window_allow_up             (NautilusWindow    *window
                                                        gboolean           allow);
 GtkUIManager *   nautilus_window_get_ui_manager       (NautilusWindow    *window);
 GtkActionGroup * nautilus_window_get_main_action_group (NautilusWindow   *window);
+NautilusNavigationState * 
+                 nautilus_window_get_navigation_state (NautilusWindow    *window);
 
 void                 nautilus_window_report_load_complete     (NautilusWindow *window,
                                                                NautilusView *view);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]