diff options
| author | Alexander Larsson <alexl@redhat.com> | 2008-10-23 09:23:04 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2008-10-23 09:23:04 +0000 |
| commit | dbfc719775e5bc10bd152613dbd3a8bfe1d4d57a (patch) | |
| tree | 576c91dc8391d2f5a46c630ac653c054e522c74f /gio | |
| parent | 8098f0db6876ba5251f85789b7e46d3025d6a82a (diff) | |
Merged from trunk:
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.
svn path=/branches/glib-2-18/; revision=7621
Diffstat (limited to 'gio')
| -rw-r--r-- | gio/ChangeLog | 19 | ||||
| -rw-r--r-- | gio/glocalfileinfo.c | 8 |
2 files changed, 21 insertions, 6 deletions
diff --git a/gio/ChangeLog b/gio/ChangeLog index f12936263..a39dba83b 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,3 +1,22 @@ +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. + 2008-10-16 Matthias Clasen <mclasen@redhat.com> * === Released 2.18.2 === diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c index 0c38e17c4..60d4686a2 100644 --- a/gio/glocalfileinfo.c +++ b/gio/glocalfileinfo.c @@ -1577,12 +1577,8 @@ _g_local_file_info_get (const char *basename, 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); } } |