[tracker/wip/carlosg/domain-ontologies: 32/76] tracker-miner-fs: Implement initial crawling fully here

[Carlos Garnacho <carlosg src gnome org>]

commit d85a477887d64d8c9889b1795d64e7f84d136ec9
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun Jun 18 13:07:54 2017 +0200

    tracker-miner-fs: Implement initial crawling fully here
    
    It seems this setting was just ignored at on libtracker-miner since the
    introduction of TrackerFileNotifier. And it does not make a lot of sense
    either, crawling is done for 2 purposes: checking mtimes and setting up
    monitors.
    
    So we have individual toggles for each of those, but if neither happens
    we could just not start the miner as well, which is most similar to the
    tracker-miner-fs behavior when this setting was introduced.

 src/miners/fs/tracker-main.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/src/miners/fs/tracker-main.c b/src/miners/fs/tracker-main.c
index 826d5c5..8263633 100644
--- a/src/miners/fs/tracker-main.c
+++ b/src/miners/fs/tracker-main.c
@@ -67,6 +67,7 @@ static gboolean no_daemon;
 static gchar *eligible;
 static gboolean version;
 static guint miners_timeout_id = 0;
+static gboolean do_crawling = FALSE;
 
 static GOptionEntry entries[] = {
        { "verbosity", 'v', 0,
@@ -327,8 +328,7 @@ miner_finished_cb (TrackerMinerFS *fs,
                total_directories_found,
                total_files_found);
 
-       if (TRACKER_IS_MINER_FILES (fs) &&
-           tracker_miner_fs_get_initial_crawling (fs)) {
+       if (TRACKER_IS_MINER_FILES (fs) && do_crawling) {
                tracker_miner_files_set_last_crawl_done (TRUE);
        }
 
@@ -676,7 +676,6 @@ main (gint argc, gchar *argv[])
        GError *error = NULL;
        gchar *log_filename = NULL;
        gboolean do_mtime_checking;
-       gboolean do_crawling;
        gboolean force_mtime_checking = FALSE;
        gboolean store_available;
 
@@ -811,7 +810,6 @@ main (gint argc, gchar *argv[])
        tracker_miner_files_set_need_mtime_check (TRUE);
 
        /* Configure files miner */
-       tracker_miner_fs_set_initial_crawling (TRACKER_MINER_FS (miner_files), do_crawling);
        tracker_miner_files_set_mtime_checking (TRACKER_MINER_FILES (miner_files), do_mtime_checking);
        g_signal_connect (miner_files, "finished",
                          G_CALLBACK (miner_finished_cb),
@@ -819,7 +817,8 @@ main (gint argc, gchar *argv[])
 
        miners = g_slist_prepend (miners, miner_files);
 
-       miner_handle_first (config, do_mtime_checking);
+       if (do_crawling)
+               miner_handle_first (config, do_mtime_checking);
 
        initialize_signal_handler ();