gnome-panel r10811 - trunk/gnome-panel

[vuntz svn gnome org]

Author: vuntz
Date: Mon Feb 11 11:08:25 2008
New Revision: 10811
URL: http://svn.gnome.org/viewvc/gnome-panel?rev=10811&view=rev

Log:
2008-02-11  Vincent Untz  <vuntz gnome org>

	* panel-util.c: (panel_util_get_icon_for_uri): remove workaround for
	application/x-gnome-saved-search places. We don't need the
	fast-content-type anymore. Maybe this was needed before because of a
	bug in gio?


Modified:
   trunk/gnome-panel/ChangeLog
   trunk/gnome-panel/panel-util.c

Modified: trunk/gnome-panel/panel-util.c
==============================================================================
--- trunk/gnome-panel/panel-util.c	(original)
+++ trunk/gnome-panel/panel-util.c	Mon Feb 11 11:08:25 2008
@@ -1615,7 +1615,6 @@
 	const char *icon;
 	GFile      *file;
 	GFileInfo  *info;
-	const char *content;
 	GIcon      *gicon;
 	char       *retval;
 
@@ -1657,23 +1656,13 @@
 		file = root;
 	}
 
-	info = g_file_query_info (file,
-				  "standard::icon,standard::fast-content-type",
+	info = g_file_query_info (file, "standard::icon",
 				  G_FILE_QUERY_INFO_NONE, NULL, NULL);
 	g_object_unref (file);
 
 	if (!info)
 		return NULL;
 
-	/* FIXME: weird that we don't get the right icon without this */
-	content = g_file_info_get_attribute_string (info,
-						    G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE);
-	if (content &&
-	    strcmp (content, "application/x-gnome-saved-search") == 0) {
-		g_object_unref (info);
-		return g_strdup (PANEL_ICON_SAVED_SEARCH);
-	}
-
 	gicon = g_file_info_get_icon (info);
 	retval = panel_util_get_icon_name_from_g_icon (gicon);
 	g_object_unref (info);