[Xfce4-commits] <xfdesktop:master> Fix for trash always showing empty on system startup (Bug 9006)

[Eric Koegel]

Updating branch refs/heads/master
         to e4e8078335775762b3c5b9ff14e785db486101c6 (commit)
       from eb1dae39687d3d7557a45b58cbabe99b36746bf7 (commit)

commit e4e8078335775762b3c5b9ff14e785db486101c6
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Mon Sep 9 09:03:34 2013 +0300

    Fix for trash always showing empty on system startup (Bug 9006)
    
    When the system starts up querying G_FILE_ATTRIBUTE_TRASH_ITEM_COUNT
    always returns 0 items. Since xfdesktop does its own counting of
    valid items in the trash:/// skipping this check fixes this bug.

 src/xfdesktop-special-file-icon.c |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/xfdesktop-special-file-icon.c b/src/xfdesktop-special-file-icon.c
index fb418ad..7509528 100644
--- a/src/xfdesktop-special-file-icon.c
+++ b/src/xfdesktop-special-file-icon.c
@@ -648,13 +648,6 @@ xfdesktop_special_file_icon_update_trash_count(XfdesktopSpecialFileIcon *special
         return;
     }
 
-    special_file_icon->priv->trash_item_count = g_file_info_get_attribute_uint32(
-                                                    special_file_icon->priv->file_info,
-                                                    G_FILE_ATTRIBUTE_TRASH_ITEM_COUNT);
-
-    if(special_file_icon->priv->trash_item_count == 0)
-        return;
-
     /* The trash count may return a number of files the user can't
      * currently delete, for example if the file is in a removable
      * drive that isn't mounted.
@@ -679,6 +672,7 @@ xfdesktop_special_file_icon_update_trash_count(XfdesktopSpecialFileIcon *special
     g_object_unref(enumerator);
 
     special_file_icon->priv->trash_item_count = n;
+    TRACE("exiting, trash count %d", n);
 }
 
 /* public API */