summaryrefslogtreecommitdiff
path: root/src/nautilus-window-menus.c
diff options
context:
space:
mode:
authorWilliam Jon McCann <jmccann@redhat.com>2012-08-08 09:35:28 -0400
committerWilliam Jon McCann <jmccann@redhat.com>2012-08-09 10:12:17 -0400
commit5f5dd8a985a1df07bf092b87347085034ff4a5db (patch)
tree2abc4d3f643ead0e8b380168fe6ecfc35ff07b23 /src/nautilus-window-menus.c
parentac7318fd164d1371359d6bb03eb4962dab9967e9 (diff)
downloadnautilus-5f5dd8a985a1df07bf092b87347085034ff4a5db.tar.gz
Move enter location into the app menu
https://bugzilla.gnome.org/show_bug.cgi?id=680985
Diffstat (limited to 'src/nautilus-window-menus.c')
-rw-r--r--src/nautilus-window-menus.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index 5d1c753d8..37ab17492 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -378,11 +378,11 @@ action_new_tab_callback (GtkAction *action,
}
static void
-action_go_to_location_callback (GtkAction *action,
+action_enter_location_callback (GtkAction *action,
gpointer user_data)
{
- NautilusWindow *window = user_data;
- nautilus_window_ensure_location_bar (window);
+ g_action_group_activate_action (G_ACTION_GROUP (g_application_get_default ()),
+ "enter-location", NULL);
}
static void
@@ -538,9 +538,9 @@ static const GtkActionEntry main_entries[] = {
/* name, stock id, label */ { NAUTILUS_ACTION_FORWARD, "go-next-symbolic", N_("_Forward"),
"<alt>Right", N_("Go to the next visited location"),
G_CALLBACK (action_forward_callback) },
- /* name, stock id, label */ { "Go to Location", NULL, N_("_Location..."),
+ /* name, stock id, label */ { NAUTILUS_ACTION_ENTER_LOCATION, NULL, N_("Enter _Location..."),
"<control>L", N_("Specify a location to open"),
- G_CALLBACK (action_go_to_location_callback) },
+ G_CALLBACK (action_enter_location_callback) },
/* name, stock id, label */ { NAUTILUS_ACTION_ADD_BOOKMARK, GTK_STOCK_ADD, N_("Bookmark this Location"),
"<control>d", N_("Add a bookmark for the current location"),
G_CALLBACK (action_add_bookmark_callback) },
@@ -583,6 +583,7 @@ static const GtkToggleActionEntry main_toggle_entries[] = {
static const gchar* app_actions[] = {
NAUTILUS_ACTION_NEW_WINDOW,
NAUTILUS_ACTION_CONNECT_TO_SERVER,
+ NAUTILUS_ACTION_ENTER_LOCATION,
NAUTILUS_ACTION_EDIT_BOOKMARKS,
NAUTILUS_ACTION_PREFERENCES,
NAUTILUS_ACTION_HELP,