glib r7621 - branches/glib-2-18/gio

[alexl svn gnome org]

Author: alexl
Date: Thu Oct 23 09:23:04 2008
New Revision: 7621
URL: http://svn.gnome.org/viewvc/glib?rev=7621&view=rev

Log:
2008-10-23  Alexander Larsson  <alexl redhat com>

	Merged from trunk:

	Bug 528320 - Incorrect icons displayed for files with custom mimetype icons
	
        * glocalfileinfo.c:
        (_g_local_file_info_get):
	Don't return the fallback icon (text-x-generic) for all files.
	This is causing problems with theme icon lookup and custom mime
	icons, as the generic fallback overrides custom mime icons in
	inherited themes.

	This is a slight change as applications might not get an icon wher
	they previously did. But there is no guarantee to get on neither before
	or after this change, so it should not break applications. Changes
	to nautilus and gtk+ will be done to manually use the generic fallback
	icon if no icon is found, but this is only required for rare cases.
	



Modified:
   branches/glib-2-18/gio/ChangeLog
   branches/glib-2-18/gio/glocalfileinfo.c

Modified: branches/glib-2-18/gio/glocalfileinfo.c
==============================================================================
--- branches/glib-2-18/gio/glocalfileinfo.c	(original)
+++ branches/glib-2-18/gio/glocalfileinfo.c	Thu Oct 23 09:23:04 2008
@@ -1577,12 +1577,8 @@
 
                       if (S_ISDIR (statbuf.st_mode)) 
                         type_icon = "folder";
-                      else if (statbuf.st_mode & S_IXUSR)
-                        type_icon = "application-x-executable";
-                      else
-                        type_icon = "text-x-generic";
-
-                      g_themed_icon_append_name (G_THEMED_ICON (icon), type_icon);
+                      if (type_icon)
+                        g_themed_icon_append_name (G_THEMED_ICON (icon), type_icon);
                     }
                 }