[tracker/external-crawler: 6/31] tracker-miner-fs: Make sure we work with the new changes to MinerFS



commit 80d4e26525d4d42a1d9d081f61f7b1ab9d342e31
Author: Martyn Russell <martyn lanedo com>
Date:   Tue May 6 11:14:25 2014 +0100

    tracker-miner-fs: Make sure we work with the new changes to MinerFS

 src/miners/fs/tracker-miner-files.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/src/miners/fs/tracker-miner-files.c b/src/miners/fs/tracker-miner-files.c
index 48ac103..f976e57 100644
--- a/src/miners/fs/tracker-miner-files.c
+++ b/src/miners/fs/tracker-miner-files.c
@@ -300,6 +300,12 @@ miner_files_initable_init (GInitable     *initable,
        GSList *dirs;
        GSList *m;
 
+       /* Chain up parent's initable callback before calling child's one */
+       if (!miner_files_initable_parent_iface->init (initable, cancellable, &inner_error)) {
+               g_propagate_error (error, inner_error);
+               return FALSE;
+       }
+
        mf = TRACKER_MINER_FILES (initable);
        fs = TRACKER_MINER_FS (initable);
        indexing_tree = tracker_miner_fs_get_indexing_tree (fs);
@@ -307,12 +313,6 @@ miner_files_initable_init (GInitable     *initable,
 
        miner_files_update_filters (mf);
 
-       /* Chain up parent's initable callback before calling child's one */
-       if (!miner_files_initable_parent_iface->init (initable, cancellable, &inner_error)) {
-               g_propagate_error (error, inner_error);
-               return FALSE;
-       }
-
        /* Set up extractor and signals */
        mf->private->connection =  g_bus_get_sync (TRACKER_IPC_BUS, NULL, &inner_error);
        if (!mf->private->connection) {
@@ -2450,6 +2450,7 @@ tracker_miner_files_new (TrackerConfig  *config,
                               NULL,
                               error,
                               "name", "Files",
+                              "root", NULL,
                               "config", config,
                               "processing-pool-wait-limit", 10,
                               "processing-pool-ready-limit", 100,


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