[Xfce4-commits] <thunar:master> Drop home icons and optimize check.

[Nick Schermer]

Updating branch refs/heads/master
         to c031e7b0887961e2cb718b58c3bc6e65b2a9abc3 (commit)
       from 7e3fd7003c33ad55a0ef5ffe9a18041c6b55d10b (commit)

commit c031e7b0887961e2cb718b58c3bc6e65b2a9abc3
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Nov 8 23:37:04 2012 +0100

    Drop home icons and optimize check.
    
    Checking for home was too expensive. Also reorder the
    checks to we do less checking for is_root.

 thunar/thunar-file.c |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/thunar/thunar-file.c b/thunar/thunar-file.c
index 7a40739..1682475 100644
--- a/thunar/thunar-file.c
+++ b/thunar/thunar-file.c
@@ -3317,15 +3317,10 @@ thunar_file_get_icon_name (const ThunarFile   *file,
   _thunar_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), NULL);
 
   /* the system root folder has a special icon */
-  if (thunar_file_is_root (file) 
+  if (thunar_file_is_directory (file)
       && thunar_file_is_local (file)
-      && thunar_file_is_directory (file))
-    {
-      return g_strdup ("drive-harddisk");
-    }
-
-  if (thunar_file_is_home (file))
-    return g_strdup (GTK_STOCK_HOME);
+      && thunar_file_is_root (file))
+    return g_strdup ("drive-harddisk");
 
   if (file->info == NULL)
     return NULL;