Don't do fallback for user-home and user-desktop to avoid problems with

        * glocalfileinfo.c: Don't do fallback for user-home and user-desktop
        to avoid problems with partial icon themes.

svn path=/trunk/; revision=7056

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 0734031..9e53ebf 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-18  Matthias Clasen <mclasen@rdhat.com>
+
+       * glocalfileinfo.c: Don't do fallback for user-home and user-desktop
+       to avoid problems with partial icon themes.
+       
 2008-06-17  Hans Breuer  <hans@breuer.org>
 
         * gwin32mount.[ch] gwin32volumemonitor.[ch] : bits and pieces from 

diff --git a/gio/glocalfileinfo.c b/gio/glocalfileinfo.c
index d71deb1..47ac134 100644 (file)
--- a/gio/glocalfileinfo.c
+++ b/gio/glocalfileinfo.c
@@ -1465,7 +1465,6 @@ _g_local_file_info_get (const char             *basename,
   is_symlink = FALSE;
 #endif
   symlink_broken = FALSE;
-  
 #ifdef S_ISLNK
   if (is_symlink)
     {
@@ -1565,18 +1564,17 @@ _g_local_file_info_get (const char             *basename,
            {
              GIcon *icon;
 
-              icon = g_content_type_get_icon (content_type);
-              if (icon != NULL)
+              if (strcmp (path, g_get_home_dir ()) == 0)
+                icon = g_themed_icon_new ("user-home");
+              else if (strcmp (path, g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP)) == 0) 
+                icon = g_themed_icon_new ("user-desktop");
+              else 
                 {
+                  icon = g_content_type_get_icon (content_type);
                   if (G_IS_THEMED_ICON (icon))
                     {
-                      const char *preferred_icon = NULL;
                       const char *type_icon = NULL;
 
-                      if (strcmp (path, g_get_home_dir ()) == 0)
-                        preferred_icon = "user-home";
-                      else if (strcmp (path, g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP)) == 0) 
-                        preferred_icon = "user-desktop";
                       if (S_ISDIR (statbuf.st_mode)) 
                         type_icon = "folder";
                       else if (statbuf.st_mode & S_IXUSR)
@@ -1584,12 +1582,12 @@ _g_local_file_info_get (const char             *basename,
                       else
                         type_icon = "text-x-generic";
 
-                      if (preferred_icon)
-                        g_themed_icon_prepend_name (G_THEMED_ICON (icon), preferred_icon);
-                      if (type_icon) 
-                        g_themed_icon_append_name (G_THEMED_ICON (icon), type_icon);
+                      g_themed_icon_append_name (G_THEMED_ICON (icon), type_icon);
                     }
+                }
 
+              if (icon != NULL)
+                {
                   g_file_info_set_icon (info, icon);
                   g_object_unref (icon);
                 }