nautilus r13886 - in trunk: . libnautilus-private

[alexl svn gnome org]

Author: alexl
Date: Thu Mar  6 10:22:03 2008
New Revision: 13886
URL: http://svn.gnome.org/viewvc/nautilus?rev=13886&view=rev

Log:
2008-03-06  Alexander Larsson  <alexl redhat com>

	* libnautilus-private/nautilus-autorun.c (_g_mount_guess_content_type):
	Only look for autorun stuff for local files.
	We can't generally exec stuff for non-local files anyway,
	and is a performance hit to do the check.



Modified:
   trunk/ChangeLog
   trunk/libnautilus-private/nautilus-autorun.c

Modified: trunk/libnautilus-private/nautilus-autorun.c
==============================================================================
--- trunk/libnautilus-private/nautilus-autorun.c	(original)
+++ trunk/libnautilus-private/nautilus-autorun.c	Thu Mar  6 10:22:03 2008
@@ -729,18 +729,18 @@
 		g_ptr_array_add (types, g_strdup ("x-content/image-picturecd"));
 	}
 
-	if (_check_file (root, ".autorun", TRUE) ||
-	    _check_file (root, "autorun", TRUE) ||
-	    _check_file (root, "autorun.sh", TRUE) ||
-	    _check_file_case_insensitive (root, "autorun.exe", TRUE) ||
-	    _check_file_case_insensitive (root, "autorun.inf", FALSE)) {
+	if (g_file_is_native (root) &&
+	    (_check_file (root, ".autorun", TRUE) ||
+	     _check_file (root, "autorun", TRUE) ||
+	     _check_file (root, "autorun.sh", TRUE) ||
+	     _check_file_case_insensitive (root, "autorun.exe", TRUE) ||
+	     _check_file_case_insensitive (root, "autorun.inf", FALSE))) {
 		/* http://standards.freedesktop.org/autostart-spec/autostart-spec-latest.html */
-
+		
 		/* http://bugzilla.gnome.org/show_bug.cgi?id=509823#c3 for the autorun.exe and autorun.inf stuff */
 		g_ptr_array_add (types, g_strdup ("x-content/software"));
 	}
 
-
 no_sniff:
 	
 	g_ptr_array_add (types, NULL);