[tracker] Revert "libtracker-miner: Postpone TrackerIndexingTree::directory-removed emission"



commit a144d5b1723e8399ac1230f80bfac6ac12bd0771
Author: Carlos Garnacho <carlosg gnome org>
Date:   Wed Aug 19 23:46:24 2015 +0200

    Revert "libtracker-miner: Postpone TrackerIndexingTree::directory-removed emission"
    
    This reverts commit 5b4ab760c4782d1b7a098605b69d547c9466d20e.
    
    There's code relying on poking the removed directory flags one last time
    during ::directory-remove, so we must prevent from recursion in some other
    ways. Spotted during make distcheck.

 src/libtracker-miner/tracker-indexing-tree.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/src/libtracker-miner/tracker-indexing-tree.c b/src/libtracker-miner/tracker-indexing-tree.c
index 9a270f6..6d9fc37 100644
--- a/src/libtracker-miner/tracker-indexing-tree.c
+++ b/src/libtracker-miner/tracker-indexing-tree.c
@@ -554,7 +554,6 @@ tracker_indexing_tree_remove (TrackerIndexingTree *tree,
        TrackerIndexingTreePrivate *priv;
        GNode *node, *parent;
        NodeData *data;
-       GFile *file;
 
        g_return_if_fail (TRACKER_IS_INDEXING_TREE (tree));
        g_return_if_fail (G_IS_FILE (directory));
@@ -576,7 +575,8 @@ tracker_indexing_tree_remove (TrackerIndexingTree *tree,
                return;
        }
 
-       file = g_object_ref (data->file);
+       g_signal_emit (tree, signals[DIRECTORY_REMOVED], 0, data->file);
+
        parent = node->parent;
        g_node_unlink (node);
 
@@ -586,9 +586,6 @@ tracker_indexing_tree_remove (TrackerIndexingTree *tree,
 
        node_data_free (node->data);
        g_node_destroy (node);
-
-       g_signal_emit (tree, signals[DIRECTORY_REMOVED], 0, file);
-       g_object_unref (file);
 }
 
 /**


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]