gtk+ r20262 - in trunk: . gtk

[ebassi svn gnome org]

Author: ebassi
Date: Sat May 31 18:52:50 2008
New Revision: 20262
URL: http://svn.gnome.org/viewvc/gtk+?rev=20262&view=rev

Log:
2008-05-31  Emmanuele Bassi  <ebassi gnome org>

	Bug 535830 â wrong content type adding an item

	* gtk/gtkrecentmanager.c:
	(gtk_recent_manager_add_item_query_info): Use the correct API
	for retrieving the fast MIME type of a URI. (Carlos Garcia
	Campos)

Modified:
   trunk/ChangeLog
   trunk/gtk/gtkrecentmanager.c

Modified: trunk/gtk/gtkrecentmanager.c
==============================================================================
--- trunk/gtk/gtkrecentmanager.c	(original)
+++ trunk/gtk/gtkrecentmanager.c	Sat May 31 18:52:50 2008
@@ -764,7 +764,16 @@
 
   if (file_info)
     {
-      recent_data.mime_type = g_content_type_get_mime_type (g_file_info_get_content_type (file_info));
+      gchar *content_type;
+
+      content_type = g_file_info_get_attribute_as_string (file_info, G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE);
+
+      if (G_LIKELY (content_type))
+        recent_data.mime_type = g_content_type_get_mime_type (content_type);
+      else
+        recent_data.mime_type = g_strdup (GTK_RECENT_DEFAULT_MIME);
+
+      g_free (content_type);
       g_object_unref (file_info);
     }
   else