summaryrefslogtreecommitdiff
path: root/src/nautilus-window.h
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2012-08-23 15:32:29 +0200
committerCosimo Cecchi <cosimoc@gnome.org>2012-08-23 15:34:45 +0200
commit52679f9710d8b27b02c6c4e0f8bf20efe7356582 (patch)
tree953468b1637506af17cc9384434832a91134b20c /src/nautilus-window.h
parent6f6171a1befc42ec4b9c82e44cf66b5dfbc7e4ac (diff)
downloadnautilus-52679f9710d8b27b02c6c4e0f8bf20efe7356582.tar.gz
window: simplify toolbar actions creation
Instead of having the toolbar create a different action group, with different actions, and having to keep those in sync with the window's main action group manually, just pass the main action group to the toolbar. This also makes NautilusNavigationState useless (and removes a lot of boilerplate code), and fixes Ctrl+1/Ctrl+2 not working correctly as shorcuts to switch view type.
Diffstat (limited to 'src/nautilus-window.h')
-rw-r--r--src/nautilus-window.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/nautilus-window.h b/src/nautilus-window.h
index 50e9e6c42..8a7996685 100644
--- a/src/nautilus-window.h
+++ b/src/nautilus-window.h
@@ -34,7 +34,6 @@
#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"
@@ -116,8 +115,6 @@ void nautilus_window_new_tab (NautilusWindow *window
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);