Merge lp:~jmiguelbenitez/pantheon-photos/fix-1368626 into lp:~pantheon-photos/pantheon-photos/trunk

[José M. Benítez]

Added launch context when launching file manager to highlight the selected file

Item is highlighted in file manager when "Show in File Manager" option is used from the context menu.

Also, Nautilus was explicitly looked up. That has been removed to use the default file manager instead.

Please note that the fix does not work when an item is shown in the same directory than a previously open file manager instance is currently displaying. But this seems to be a Files thing (this behavior can be easily reproduced launching instances from the command line).

I guess I should file a bug against Files to see what people there say about it, but, as long as Photos is concerned, this fix should be as good as it gets ;)

[Corentin Noël (tintou)]

Really nice fix.

review: Approve

=== modified file 'src/AppWindow.vala'
--- src/AppWindow.vala	2015-09-05 18:50:53 +0000
+++ src/AppWindow.vala	2015-12-27 12:20:41 +0000
@@ -754,17 +754,10 @@
     }
 
     public void show_file_uri (File file) throws Error {
-        string tmp;
-
-        // if file manager is nautilus then pass the full path to file; otherwise pass
-        // the enclosing directory
-        if (get_nautilus_install_location () != null) {
-            tmp = file.get_uri ().replace ("'", "\\\'");
-            show_file_in_nautilus (tmp);
-        } else {
-            tmp = file.get_parent ().get_uri ().replace ("'", "\\\'");
-            show_uri (tmp);
-        }
+        AppInfo app_info = AppInfo.get_default_for_type ("inode/directory", true);
+        var file_list = new List<File> ();
+        file_list.append (file);
+        app_info.launch (file_list, get_window ().get_screen ().get_display ().get_app_launch_context ());
     }
 
     public void show_uri (string url) throws Error {

=== modified file 'src/util/system.vala'
--- src/util/system.vala	2014-08-24 00:41:11 +0000
+++ src/util/system.vala	2015-12-27 12:20:41 +0000
@@ -23,18 +23,10 @@
     return exec_dir1.has_prefix (prefix_dir) ? prefix_dir : null;
 }
 
-string get_nautilus_install_location () {
-    return Environment.find_program_in_path ("nautilus");
-}
-
 void sys_show_uri (Gdk.Screen screen, string uri) throws Error {
     Gtk.show_uri (screen, uri, Gdk.CURRENT_TIME);
 }
 
-void show_file_in_nautilus (string filename) throws Error {
-    GLib.Process.spawn_command_line_async (get_nautilus_install_location () + " " + filename);
-}
-
 int posix_wexitstatus (int status) {
     return (((status) & 0xff00) >> 8);
-}
\ No newline at end of file
+}