summaryrefslogtreecommitdiff
path: root/src/nautilus-window.c
diff options
context:
space:
mode:
authorSachin Daluja <30343-sachindaluja@users.noreply.gitlab.gnome.org>2020-05-24 13:29:49 -0400
committerAntónio Fernandes <antoniojpfernandes@gmail.com>2020-07-12 16:27:10 +0000
commit9c08b6d2cf9ebe863d242446ab4e2fefc6620587 (patch)
tree92dbc29aec0c0cf2ceed6b4704ad636ff8873d09 /src/nautilus-window.c
parent5561219e34d0925ea752ffd87c13cd95258e3172 (diff)
downloadnautilus-9c08b6d2cf9ebe863d242446ab4e2fefc6620587.tar.gz
window-slot: Rename RestoreTabData to NautilusNavigationState
This struct is going to be used to also restore navigation state when replacing the active window slot in order to handle other-locations:// Also enhance it to also save and restore the current location bookmark.
Diffstat (limited to 'src/nautilus-window.c')
-rw-r--r--src/nautilus-window.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index c7f076fee..ee5b16051 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -1216,7 +1216,7 @@ action_restore_tab (GSimpleAction *action,
NautilusWindowOpenFlags flags;
g_autoptr (GFile) location = NULL;
NautilusWindowSlot *slot;
- RestoreTabData *data;
+ NautilusNavigationState *data;
if (g_queue_get_length (window->tab_data_queue) == 0)
{
@@ -1232,9 +1232,9 @@ action_restore_tab (GSimpleAction *action,
slot = nautilus_window_create_and_init_slot (window, location, flags);
nautilus_window_slot_open_location_full (slot, location, flags, NULL);
- nautilus_window_slot_restore_from_data (slot, data);
+ nautilus_window_slot_restore_navigation_state (slot, data);
- free_restore_tab_data (data);
+ free_navigation_state (data);
}
static guint
@@ -1435,7 +1435,7 @@ nautilus_window_slot_close (NautilusWindow *window,
NautilusWindowSlot *slot)
{
NautilusWindowSlot *next_slot;
- RestoreTabData *data;
+ NautilusNavigationState *data;
DEBUG ("Requesting to remove slot %p from window %p", slot, window);
if (window == NULL)
@@ -1449,7 +1449,7 @@ nautilus_window_slot_close (NautilusWindow *window,
nautilus_window_set_active_slot (window, next_slot);
}
- data = nautilus_window_slot_get_restore_tab_data (slot);
+ data = nautilus_window_slot_get_navigation_state (slot);
if (data != NULL)
{
g_queue_push_head (window->tab_data_queue, data);
@@ -2364,7 +2364,7 @@ nautilus_window_finalize (GObject *object)
G_CALLBACK (nautilus_window_on_undo_changed),
window);
- g_queue_free_full (window->tab_data_queue, free_restore_tab_data);
+ g_queue_free_full (window->tab_data_queue, free_navigation_state);
g_object_unref (window->pad_controller);