[Xfce4-commits] <thunar:nick/new-shortcuts-pane-model> Fix loading folder in tree view.

[Nick Schermer]

Updating branch refs/heads/nick/new-shortcuts-pane-model
         to c5ff5b034dc62d8b3324cdd62094b3323e6a7477 (commit)
       from 8f8e4d6d26702b140efd053aebbdfa6bbcb4efc3 (commit)

commit c5ff5b034dc62d8b3324cdd62094b3323e6a7477
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Oct 7 11:48:23 2012 +0200

    Fix loading folder in tree view.

 thunar/thunar-tree-model.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/thunar/thunar-tree-model.c b/thunar/thunar-tree-model.c
index 913ed23..dd44423 100644
--- a/thunar/thunar-tree-model.c
+++ b/thunar/thunar-tree-model.c
@@ -1218,10 +1218,10 @@ thunar_tree_model_item_reset (ThunarTreeModelItem *item)
 static void
 thunar_tree_model_item_load_folder (ThunarTreeModelItem *item)
 {
-  _thunar_return_if_fail (item->file != NULL || item->device != NULL);
+  _thunar_return_if_fail (THUNAR_IS_FILE (item->file) || THUNAR_IS_DEVICE (item->device));
 
   /* schedule the "load" idle source (if not already done) */
-  if (G_LIKELY (item->load_idle_id == 0 && item->device == NULL))
+  if (G_LIKELY (item->load_idle_id == 0 && item->folder == NULL))
     {
       item->load_idle_id = g_idle_add_full (G_PRIORITY_HIGH, thunar_tree_model_item_load_idle,
                                             item, thunar_tree_model_item_load_idle_destroy);