[Xfce4-commits] <thunar:master> Fixed missing inode-directory/folder icons on old systems.

[Andrzej]

Updating branch refs/heads/master
         to 38e528cfe03d39ce6de3e82c3a338853352e21f4 (commit)
       from 6843caf9afdef2ffa8eeb170938f565699280ec5 (commit)

commit 38e528cfe03d39ce6de3e82c3a338853352e21f4
Author: Andrzej <ndrwrdck at gmail.com>
Date:   Sat Dec 7 03:32:27 2013 +0000

    Fixed missing inode-directory/folder icons on old systems.
    
    This error was seen on RHEL5 with custom-built Gtk stack.
    The system was distributed with a "folder" icon but was missing
    an "inode-directory" icon expected by new glib/gtk.

 thunar/thunar-file.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index dc31654..c45cf81 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -3656,9 +3656,12 @@ thunar_file_get_icon_name (ThunarFile          *file,
         g_object_unref (icon);
     }
 
-  /* store new name, or empty string to avoid recursion */
+  /* store new name, fallback to legacy names, or empty string to avoid recursion */
   if (G_LIKELY (icon_name != NULL))
     file->icon_name = icon_name;
+  else if (file->kind == G_FILE_TYPE_DIRECTORY
+           && gtk_icon_theme_has_icon (icon_theme, "folder"))
+    icon_name = g_strdup ("folder");
   else
     file->icon_name = g_strdup ("");