nautilus r15052 - in trunk: . libnautilus-private

[alexl svn gnome org]

Author: alexl
Date: Wed Mar  4 11:52:40 2009
New Revision: 15052
URL: http://svn.gnome.org/viewvc/nautilus?rev=15052&view=rev

Log:
2009-03-04  Alexander Larsson  <alexl redhat com>

	Bug 573991 â Nautilus does not recognize some .desktop files as launchers

        * libnautilus-private/nautilus-link.c:
        (nautilus_link_get_link_info_given_file_contents):
	Don't try to sniff the contents, we'll handle that when parsing anyway.
	And sniffing breaks if there are too much comments before the first group in
	the desktop file.




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

Modified: trunk/libnautilus-private/nautilus-link.c
==============================================================================
--- trunk/libnautilus-private/nautilus-link.c	(original)
+++ trunk/libnautilus-private/nautilus-link.c	Wed Mar  4 11:52:40 2009
@@ -88,18 +88,6 @@
 }
 
 static gboolean
-is_link_data (const char *file_contents, int file_size)
-{
-	char *mimetype;
-	gboolean res;
-
-	mimetype = g_content_type_guess (NULL, file_contents, file_size, NULL);
-	res =  is_link_mime_type (mimetype);
-	g_free (mimetype);
-	return res;
-}
-
-static gboolean
 _g_key_file_load_from_gfile (GKeyFile *key_file,
 			     GFile *file,
 			     GKeyFileFlags flags,
@@ -555,10 +543,6 @@
 	char **only_show_in;
 	char **not_show_in;
 
-	if (!is_link_data (file_contents, link_file_size)) {
-		return;
-	}
-
 	key_file = g_key_file_new ();
 	if (!g_key_file_load_from_data (key_file,
 					file_contents,