[tracker/wip/carlosg/domain-ontologies: 78/116] libtracker-miner: Merge tracker_miner_fs_check_file[with_priority]

[Carlos Garnacho <carlosg src gnome org>]

commit 24eb317c30ef245a966a1bd94dd95a0b0bf1ae1c
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun Jun 18 14:08:15 2017 +0200

    libtracker-miner: Merge tracker_miner_fs_check_file[with_priority]
    
    Only check_file() remains, with an extra priority argument. The default
    G_PRIORITY_HIGH in the older check_file() was unintuitive, and is now
    explicitly specified in the org.freedesktop.Tracker1.Miner.Files.Index
    interface calls.

 .../libtracker-miner/libtracker-miner-sections.txt |    1 -
 src/libtracker-miner/tracker-miner-fs.c            |   32 +++----------------
 src/libtracker-miner/tracker-miner-fs.h            |    4 --
 src/libtracker-miner/tracker-miner.vapi            |    3 +-
 src/miners/fs/tracker-miner-files-index.c          |    6 ++-
 5 files changed, 10 insertions(+), 36 deletions(-)
---
diff --git a/docs/reference/libtracker-miner/libtracker-miner-sections.txt 
b/docs/reference/libtracker-miner/libtracker-miner-sections.txt
index c200060..a4a446c 100644
--- a/docs/reference/libtracker-miner/libtracker-miner-sections.txt
+++ b/docs/reference/libtracker-miner/libtracker-miner-sections.txt
@@ -187,7 +187,6 @@ tracker_miner_fs_get_data_provider
 tracker_miner_fs_get_throttle
 tracker_miner_fs_set_throttle
 tracker_miner_fs_check_file
-tracker_miner_fs_check_file_with_priority
 tracker_miner_fs_writeback_file
 tracker_miner_fs_writeback_notify
 tracker_miner_fs_notify_finish
diff --git a/src/libtracker-miner/tracker-miner-fs.c b/src/libtracker-miner/tracker-miner-fs.c
index 860416e..c917249 100644
--- a/src/libtracker-miner/tracker-miner-fs.c
+++ b/src/libtracker-miner/tracker-miner-fs.c
@@ -2820,7 +2820,7 @@ check_file_parents (TrackerMinerFS *fs,
 }
 
 /**
- * tracker_miner_fs_check_file_with_priority:
+ * tracker_miner_fs_check_file:
  * @fs: a #TrackerMinerFS
  * @file: #GFile for the file to check
  * @priority: the priority of the check task
@@ -2834,10 +2834,10 @@ check_file_parents (TrackerMinerFS *fs,
  * Since: 0.10
  **/
 void
-tracker_miner_fs_check_file_with_priority (TrackerMinerFS *fs,
-                                           GFile          *file,
-                                           gint            priority,
-                                           gboolean        check_parents)
+tracker_miner_fs_check_file (TrackerMinerFS *fs,
+                             GFile          *file,
+                             gint            priority,
+                             gboolean        check_parents)
 {
        gboolean should_process = TRUE;
        gchar *uri;
@@ -2979,28 +2979,6 @@ tracker_miner_fs_writeback_notify (TrackerMinerFS *fs,
 }
 
 /**
- * tracker_miner_fs_check_file:
- * @fs: a #TrackerMinerFS
- * @file: #GFile for the file to check
- * @check_parents: whether to check parents and eligibility or not
- *
- * Tells the filesystem miner to check and index a file,
- * this file must be part of the usual crawling directories
- * of #TrackerMinerFS. See tracker_miner_fs_directory_add().
- *
- * Since: 0.10
- **/
-void
-tracker_miner_fs_check_file (TrackerMinerFS *fs,
-                             GFile          *file,
-                             gboolean        check_parents)
-{
-       tracker_miner_fs_check_file_with_priority (fs, file,
-                                                  G_PRIORITY_HIGH,
-                                                  check_parents);
-}
-
-/**
  * tracker_miner_fs_notify_finish:
  * @fs: a #TrackerMinerFS
  * @task: a #GTask obtained in a #TrackerMinerFS signal/vmethod
diff --git a/src/libtracker-miner/tracker-miner-fs.h b/src/libtracker-miner/tracker-miner-fs.h
index 4b7c174..8d4d2f2 100644
--- a/src/libtracker-miner/tracker-miner-fs.h
+++ b/src/libtracker-miner/tracker-miner-fs.h
@@ -137,10 +137,6 @@ void                  tracker_miner_fs_set_throttle          (TrackerMinerFS  *f
 /* Queueing files to be processed AFTER checking rules in IndexingTree */
 void                  tracker_miner_fs_check_file            (TrackerMinerFS  *fs,
                                                               GFile           *file,
-                                                              gboolean         check_parents);
-void                  tracker_miner_fs_check_file_with_priority
-                                                             (TrackerMinerFS  *fs,
-                                                              GFile           *file,
                                                               gint             priority,
                                                               gboolean         check_parents);
 
diff --git a/src/libtracker-miner/tracker-miner.vapi b/src/libtracker-miner/tracker-miner.vapi
index 648c18a..a92b88f 100644
--- a/src/libtracker-miner/tracker-miner.vapi
+++ b/src/libtracker-miner/tracker-miner.vapi
@@ -109,8 +109,7 @@ namespace Tracker {
        public abstract class MinerFS : Tracker.Miner, GLib.Initable {
                [CCode (has_construct_function = false)]
                protected MinerFS ();
-               public void check_file (GLib.File file, bool check_parents);
-               public void check_file_with_priority (GLib.File file, int priority, bool check_parents);
+               public void check_file (GLib.File file, int priority, bool check_parents);
                public static GLib.Quark error_quark ();
                public void notify_finish (GLib.File file, GLib.Task task, string sparql, GLib.Error error);
                public unowned Tracker.DataProvider get_data_provider ();
diff --git a/src/miners/fs/tracker-miner-files-index.c b/src/miners/fs/tracker-miner-files-index.c
index ea995f0..481bbcd 100644
--- a/src/miners/fs/tracker-miner-files-index.c
+++ b/src/miners/fs/tracker-miner-files-index.c
@@ -227,7 +227,8 @@ mime_types_cb (GObject      *object,
 
                        url = tracker_sparql_cursor_get_string (cursor, 0, NULL);
                        file = g_file_new_for_uri (url);
-                       tracker_miner_fs_check_file (TRACKER_MINER_FS (mtd->miner_files), file, FALSE);
+                       tracker_miner_fs_check_file (TRACKER_MINER_FS (mtd->miner_files),
+                                                    file, G_PRIORITY_HIGH, FALSE);
                        g_object_unref (file);
                }
 
@@ -411,7 +412,8 @@ handle_method_call_index_file (TrackerMinerFilesIndex *miner,
                                                                     file);
                }
        } else {
-               tracker_miner_fs_check_file (TRACKER_MINER_FS (priv->files_miner), file, do_checks);
+               tracker_miner_fs_check_file (TRACKER_MINER_FS (priv->files_miner),
+                                            file, G_PRIORITY_HIGH, do_checks);
        }
 
        tracker_dbus_request_end (request, NULL);