Merge lp:~jeremywootten/pantheon-files/fix-get_display_target_uri into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Fix ownership issue with gof_file_get_display_target_uri and pantheon-files-core.vapi

This branch corrects an ownership/nullabilty error in the core .vapi file.

The function gof_file_get_display_target_uri now always returns an owned string (previously null was possible although the .vapi did not recognise this)

=== modified file 'libcore/gof-file.c'
--- libcore/gof-file.c	2016-11-06 14:42:31 +0000
+++ libcore/gof-file.c	2016-12-03 12:12:57 +0000
@@ -2598,7 +2598,16 @@
 char*
 gof_file_get_display_target_uri (GOFFile *file)
 {
-    return g_file_info_get_attribute_as_string (file->info, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI);
+    /* This returns a string that requires freeing */
+    gchar* uri;
+
+    uri = g_file_info_get_attribute_as_string (file->info, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI);
+
+    if (uri == NULL) {
+        uri = strdup (file->uri);
+    }
+
+    return uri;
 }
 
 const gchar *

=== modified file 'libcore/pantheon-files-core-C.vapi'
--- libcore/pantheon-files-core-C.vapi	2016-09-24 15:52:11 +0000
+++ libcore/pantheon-files-core-C.vapi	2016-12-03 12:12:57 +0000
@@ -333,7 +333,7 @@
         public bool is_smb_uri_scheme ();
         public bool is_connected;
 
-        public unowned string get_display_target_uri ();
+        public string get_display_target_uri ();
 
         public GLib.AppInfo get_default_handler ();