[nautilus/remove-desktop-files-and-links: 7/7] file: Remove get_target_uri

[Carlos Soriano <csoriano src gnome org>]

commit 1c2cfa7549870a1721523596335ca3e6d9888324
Author: Carlos Soriano <csoriano gnome org>
Date:   Wed May 9 15:31:14 2018 +0200

    file: Remove get_target_uri
    
    It's now effectively the same as get_uri since NautilusLink is gone.
    
    We need to think whether those need to be get_activation_uri though.

 src/nautilus-canvas-view.c         |  2 +-
 src/nautilus-file.c                | 12 ------------
 src/nautilus-file.h                |  3 ---
 src/nautilus-files-view.c          |  2 +-
 src/nautilus-properties-window.c   |  2 +-
 src/nautilus-tree-view-drag-dest.c |  2 +-
 6 files changed, 4 insertions(+), 19 deletions(-)
---
diff --git a/src/nautilus-canvas-view.c b/src/nautilus-canvas-view.c
index a3683da4a..f74ea06db 100644
--- a/src/nautilus-canvas-view.c
+++ b/src/nautilus-canvas-view.c
@@ -1234,7 +1234,7 @@ get_icon_drop_target_uri_callback (NautilusCanvasContainer *container,
     g_return_val_if_fail (NAUTILUS_IS_FILE (file), NULL);
     g_return_val_if_fail (NAUTILUS_IS_CANVAS_VIEW (canvas_view), NULL);
 
-    return nautilus_file_get_target_uri (file);
+    return nautilus_file_get_uri (file);
 }
 
 /* Preferences changed callbacks */
diff --git a/src/nautilus-file.c b/src/nautilus-file.c
index 2df7f5dd8..8ab562753 100644
--- a/src/nautilus-file.c
+++ b/src/nautilus-file.c
@@ -4512,18 +4512,6 @@ nautilus_file_get_activation_location (NautilusFile *file)
     return nautilus_file_get_location (file);
 }
 
-char *
-nautilus_file_get_target_uri (NautilusFile *file)
-{
-    char *uri;
-
-    g_return_val_if_fail (NAUTILUS_IS_FILE (file), NULL);
-
-    uri = nautilus_file_get_uri (file);
-
-    return uri;
-}
-
 static gboolean
 is_uri_relative (const char *uri)
 {
diff --git a/src/nautilus-file.h b/src/nautilus-file.h
index ad25a1b10..33d897dcf 100644
--- a/src/nautilus-file.h
+++ b/src/nautilus-file.h
@@ -459,9 +459,6 @@ gboolean                nautilus_file_is_trusted_link                   (Nautilu
 gboolean                nautilus_file_has_activation_uri                (NautilusFile                   
*file);
 char *                  nautilus_file_get_activation_uri                (NautilusFile                   
*file);
 GFile *                 nautilus_file_get_activation_location           (NautilusFile                   
*file);
-
-char *                  nautilus_file_get_target_uri                    (NautilusFile                   
*file);
-
 GIcon *                 nautilus_file_get_gicon                         (NautilusFile                   
*file,
                                                                         NautilusFileIconFlags           
flags);
 NautilusIconInfo *      nautilus_file_get_icon                          (NautilusFile                   
*file,
diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c
index 5151c7f23..968a2fed0 100644
--- a/src/nautilus-files-view.c
+++ b/src/nautilus-files-view.c
@@ -5011,7 +5011,7 @@ get_file_paths_or_uris_as_newline_delimited_string (NautilusFilesView *view,
     expanding_string = g_string_new ("");
     for (node = selection; node != NULL; node = node->next)
     {
-        uri = nautilus_file_get_target_uri (NAUTILUS_FILE (node->data));
+        uri = nautilus_file_get_uri (NAUTILUS_FILE (node->data));
         if (uri == NULL)
         {
             continue;
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 5ebc4f6c0..66b533d8e 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -285,7 +285,7 @@ get_target_file_for_original_file (NautilusFile *file)
     g_autoptr (GFile) location = NULL;
     g_autofree char *uri_to_display = NULL;
 
-    uri_to_display = nautilus_file_get_target_uri (file);
+    uri_to_display = nautilus_file_get_uri (file);
     location = g_file_new_for_uri (uri_to_display);
     target_file = nautilus_file_get (location);
 
diff --git a/src/nautilus-tree-view-drag-dest.c b/src/nautilus-tree-view-drag-dest.c
index a99c6d520..c32f86568 100644
--- a/src/nautilus-tree-view-drag-dest.c
+++ b/src/nautilus-tree-view-drag-dest.c
@@ -456,7 +456,7 @@ get_drop_target_uri_for_path (NautilusTreeViewDragDest *dest,
                                          dest->details->drag_list);
     if (can)
     {
-        target = nautilus_file_get_target_uri (file);
+        target = nautilus_file_get_uri (file);
     }
     nautilus_file_unref (file);