Updating branch refs/heads/master
to d5d5344a05d92999cc982f0b2a2d4f53b4de0832 (commit)
from d01b728e6d0d886497698fdc9da0b138bb95a0f0 (commit)
commit d5d5344a05d92999cc982f0b2a2d4f53b4de0832
Author: Nick Schermer <[email protected]>
Date: Sat Nov 10 18:00:42 2012 +0100
Work around an unneeded check.
GIO has a bug that most icon-names start with "(null)",
do a quick check to skip those.
thunar/thunar-file.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index 3a5710e..c3118bb 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -3377,7 +3377,7 @@ thunar_file_get_icon_name (const ThunarFile *file,
if (G_LIKELY (names != NULL))
{
for (i = 0; names[i] != NULL; ++i)
- if (names[i] != NULL
+ if (*names[i] != '(' /* see gnome bug 688042 */
&& gtk_icon_theme_has_icon (icon_theme, names[i]))
{
icon_name = g_strdup (names[i]);
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
