Commit acf3e032 authored by Cosimo Cecchi's avatar Cosimo Cecchi

window-slot: rename get_current_location -> get_current_uri

parent 977fc638
......@@ -5824,7 +5824,7 @@ move_copy_selection_to_next_pane (FMDirectoryView *view,
slot = nautilus_window_get_extra_slot (fm_directory_view_get_nautilus_window (view));
g_return_if_fail (slot != NULL);
dest_location = nautilus_window_slot_get_current_location (slot);
dest_location = nautilus_window_slot_get_current_uri (slot);
g_return_if_fail (dest_location != NULL);
move_copy_selection_to_location (view, copy_action, dest_location);
......@@ -5852,7 +5852,7 @@ action_move_to_next_pane_callback (GtkAction *action, gpointer callback_data)
slot = nautilus_window_get_extra_slot (fm_directory_view_get_nautilus_window (view));
g_return_if_fail (slot != NULL);
dest_location = nautilus_window_slot_get_current_location (slot);
dest_location = nautilus_window_slot_get_current_uri (slot);
g_return_if_fail (dest_location != NULL);
move_copy_selection_to_location (view, GDK_ACTION_MOVE, dest_location);
......
......@@ -456,7 +456,7 @@ update_places (NautilusPlacesSidebar *sidebar)
sidebar->bookmarks_header_added = FALSE;
slot = nautilus_window_get_active_slot (sidebar->window);
location = nautilus_window_slot_get_current_location (slot);
location = nautilus_window_slot_get_current_uri (slot);
volume_monitor = sidebar->volume_monitor;
......@@ -3195,7 +3195,7 @@ nautilus_places_sidebar_set_parent_window (NautilusPlacesSidebar *sidebar,
slot = nautilus_window_get_active_slot (window);
sidebar->bookmarks = nautilus_bookmark_list_new ();
sidebar->uri = nautilus_window_slot_get_current_location (slot);
sidebar->uri = nautilus_window_slot_get_current_uri (slot);
g_signal_connect_object (sidebar->bookmarks, "contents_changed",
G_CALLBACK (update_places),
......
......@@ -1394,7 +1394,7 @@ create_tree (FMTreeView *view)
view);
slot = nautilus_window_get_active_slot (view->details->window);
location = nautilus_window_slot_get_current_location (slot);
location = nautilus_window_slot_get_current_uri (slot);
schedule_select_and_show_location (view, location);
g_free (location);
}
......@@ -1602,7 +1602,7 @@ fm_tree_view_set_parent_window (FMTreeView *sidebar,
g_signal_connect_object (window, "loading_uri",
G_CALLBACK (loading_uri_callback), sidebar, 0);
location = nautilus_window_slot_get_current_location (slot);
location = nautilus_window_slot_get_current_uri (slot);
loading_uri_callback (window, location, sidebar);
g_free (location);
......
......@@ -92,7 +92,7 @@ slot_proxy_drag_motion (GtkWidget *widget,
}
if (target_slot != NULL) {
target_uri = nautilus_window_slot_get_current_location (target_slot);
target_uri = nautilus_window_slot_get_current_uri (target_slot);
}
}
......@@ -225,7 +225,7 @@ slot_proxy_handle_drop (GtkWidget *widget,
if (drag_info->target_location != NULL) {
target_uri = g_file_get_uri (drag_info->target_location);
} else if (target_slot != NULL) {
target_uri = nautilus_window_slot_get_current_location (target_slot);
target_uri = nautilus_window_slot_get_current_uri (target_slot);
}
target_view = NULL;
......
......@@ -499,9 +499,9 @@ nautilus_window_slot_add_current_location_to_history_list (NautilusWindowSlot *s
}
}
/* returns either the pending or the actual current location - used by side panes. */
/* returns either the pending or the actual current uri */
char *
nautilus_window_slot_get_current_location (NautilusWindowSlot *slot)
nautilus_window_slot_get_current_uri (NautilusWindowSlot *slot)
{
if (slot->pending_location != NULL) {
return g_file_get_uri (slot->pending_location);
......
......@@ -185,8 +185,8 @@ void nautilus_window_slot_add_current_location_to_history_list (NautilusWindo
void nautilus_window_slot_is_in_active_pane (NautilusWindowSlot *slot, gboolean is_active);
NautilusView * nautilus_window_slot_get_current_view (NautilusWindowSlot *slot);
char * nautilus_window_slot_get_current_location (NautilusWindowSlot *slot);
NautilusWindow * nautilus_window_slot_get_window (NautilusWindowSlot *slot);
char * nautilus_window_slot_get_current_uri (NautilusWindowSlot *slot);
NautilusWindow * nautilus_window_slot_get_window (NautilusWindowSlot *slot);
void nautilus_window_slot_make_hosting_pane_active (NautilusWindowSlot *slot);
#endif /* NAUTILUS_WINDOW_SLOT_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment