Merge lp:~jeremywootten/pantheon-files/fix-1582432-open-desktopfiles-in-text-editor into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Do no execute an executable file when an app to "Open with" is supplied (lp:1582432)

When launching a file that is executable, do not execute it if an app to open it with is explicitly supplied.

=== modified file 'libcore/gof-file.c'
--- libcore/gof-file.c	2016-05-01 18:18:35 +0000
+++ libcore/gof-file.c	2016-05-18 11:15:11 +0000
@@ -2056,14 +2056,17 @@
     g_return_val_if_fail (GOF_IS_FILE (file), FALSE);
     g_return_val_if_fail (GDK_IS_SCREEN (screen), FALSE);
 
-    /* check if we should execute the file */
-    if (gof_file_is_executable (file))
-        return gof_file_execute (file, screen, NULL, &error);
-
     if (app_info != NULL)
         app = g_app_info_dup (app_info);
-    if (app == NULL)
-        app = gof_file_get_default_handler (file);
+
+    /* Do not run executables if an app to open them with has been supplied */
+    if (app == NULL) {
+        /* check if we should execute the file */
+        if (gof_file_is_executable (file))
+            return gof_file_execute (file, screen, NULL, &error);
+        else
+            app = gof_file_get_default_handler (file);
+    }
     if (app == NULL)
     {
         //TODO