Merge lp:~jeremywootten/pantheon-files/fix-1042439-open-link-type-desktop-files-correctly into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Check if is desktop file first in gof_file_is_executable ()

This branch fixes the linked bug by ensuring that desktop files are treated as executables.

=== modified file 'libcore/gof-file.c'
--- libcore/gof-file.c	2016-04-03 17:28:42 +0000
+++ libcore/gof-file.c	2016-04-14 17:37:36 +0000
@@ -1446,16 +1446,16 @@
 
     g_return_val_if_fail (GOF_IS_FILE (file), FALSE);
 
+    if (gof_file_is_desktop_file (file)) {
+        return TRUE;
+    }
+
     if (file->target_gof)
         return gof_file_is_executable (file->target_gof);
     if (file->info == NULL) {
         return FALSE;
     }
 
-    if (gof_file_is_desktop_file (file)) {
-        return TRUE;
-    }
-
     if (g_file_info_get_attribute_boolean (file->info, G_FILE_ATTRIBUTE_ACCESS_CAN_EXECUTE))
     {
         /* get the content type of the file */