[tracker/wip/carlosg/shuffle-libtracker-miner: 1/2] libtracker-control: Drop libtracker-control as a public library

[Carlos Garnacho <carlosg src gnome org>]

commit f8562b0278d187e9be5fc022c5c474e438265e46
Author: Carlos Garnacho <carlosg gnome org>
Date:   Wed Dec 11 20:09:08 2019 +0100

    libtracker-control: Drop libtracker-control as a public library
    
    This API gained some users, but it is solely used to deal with
    one miner (tracker-miner-fs, obviously). In those circumstances,
    it's about just as practical to poke well-known DBus names,
    certainly there's little users beyond tracker CLI for generic
    management of miners.

 .../libtracker-control/libtracker-control-docs.xml | 78 ----------------------
 docs/reference/libtracker-control/meson.build      | 12 ----
 .../libtracker-control/migrating-1to2.xml          | 25 -------
 docs/reference/libtracker-control/version.xml.in   |  1 -
 .../reference/libtracker-sparql/migrating-2to3.xml | 10 +++
 docs/reference/meson.build                         |  1 -
 src/libtracker-control/.gitignore                  |  3 -
 src/libtracker-control/TrackerControl-1.0.metadata |  6 --
 src/libtracker-control/meson.build                 | 55 ---------------
 src/libtracker-control/tracker-control-2.map       |  6 --
 src/libtracker-control/tracker-control.deps        |  1 -
 src/libtracker-control/tracker-control.h           | 29 --------
 src/libtracker-control/tracker-control.vapi        | 38 -----------
 src/meson.build                                    |  3 -
 src/tracker/meson.build                            |  3 +-
 src/tracker/tracker-config.c                       |  2 +-
 src/tracker/tracker-daemon.c                       |  4 +-
 src/tracker/tracker-index.c                        |  2 +-
 .../tracker-miner-manager.c                        |  3 +-
 .../tracker-miner-manager.h                        |  0
 src/tracker/tracker-reset.c                        |  2 +-
 src/tracker/tracker-status.c                       |  2 +-
 22 files changed, 20 insertions(+), 266 deletions(-)
---
diff --git a/docs/reference/libtracker-sparql/migrating-2to3.xml 
b/docs/reference/libtracker-sparql/migrating-2to3.xml
index 9c4201f60..282300f89 100644
--- a/docs/reference/libtracker-sparql/migrating-2to3.xml
+++ b/docs/reference/libtracker-sparql/migrating-2to3.xml
@@ -68,4 +68,14 @@ SELECT ?s { ?s a nfo:FileDataObject }
       graph, with ?g being NULL.
     </para>
   </section>
+  <section>
+    <title>No libtracker-control</title>
+    <para>
+      This library offered fully generic control method to Tracker
+      miners. This genericity is not widely useful, so the feature is
+      no longer exposed as a library. Users are recommended to perform
+      direct DBus calls to the well-known name of the miner(s) of
+      interest.
+    </para>
+  </section>
 </chapter>
diff --git a/docs/reference/meson.build b/docs/reference/meson.build
index f64931159..314c6c494 100644
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -11,7 +11,6 @@ fixxref_args = [
     '--extra-dir=@0@'.format(join_paths(docpath, 'libtracker-sparql')),
 ]
 
-subdir('libtracker-control')
 subdir('libtracker-miner')
 subdir('libtracker-sparql')
 
diff --git a/src/meson.build b/src/meson.build
index 04f7f3983..dfcfe1460 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -23,9 +23,6 @@ subdir('libtracker-sparql-backend')
 # Public libtracker-miner library
 subdir('libtracker-miner')
 
-# Internal control library
-subdir('libtracker-control')
-
 # Public commandline control tool
 subdir('tracker')
 
diff --git a/src/tracker/meson.build b/src/tracker/meson.build
index 1bc682cb2..75a822a1d 100644
--- a/src/tracker/meson.build
+++ b/src/tracker/meson.build
@@ -1,4 +1,5 @@
 sources = [
+    'tracker-miner-manager.c',
     'tracker-main.c',
     'tracker-config.c',
     'tracker-daemon.c',
@@ -25,7 +26,7 @@ executable('tracker', sources,
     install_rpath: tracker_install_rpath,
     # This doesn't depend on tracker_common_dep because of
     # https://github.com/mesonbuild/meson/issues/671
-    dependencies: [tracker_control_dep, tracker_sparql_dep, tracker_data_dep],
+    dependencies: [tracker_sparql_dep, tracker_data_dep],
     include_directories: [commoninc, configinc, srcinc],
 )
 
diff --git a/src/tracker/tracker-config.c b/src/tracker/tracker-config.c
index 59d756132..13bf58e25 100644
--- a/src/tracker/tracker-config.c
+++ b/src/tracker/tracker-config.c
@@ -24,9 +24,9 @@
 #include <glib/gi18n.h>
 
 #include <libtracker-common/tracker-common.h>
-#include <libtracker-control/tracker-control.h>
 
 #include "tracker-config.h"
+#include "tracker-miner-manager.h"
 
 GSList *
 tracker_gsettings_get_all (gint *longest_name_length)
diff --git a/src/tracker/tracker-daemon.c b/src/tracker/tracker-daemon.c
index c73658477..240152df6 100644
--- a/src/tracker/tracker-daemon.c
+++ b/src/tracker/tracker-daemon.c
@@ -32,13 +32,13 @@
 #include <glib/gprintf.h>
 
 #include <libtracker-common/tracker-common.h>
-#include <libtracker-miner/tracker-miner.h>
-#include <libtracker-control/tracker-control.h>
+#include <libtracker-sparql/tracker-sparql.h>
 
 #include "tracker-daemon.h"
 #include "tracker-config.h"
 #include "tracker-process.h"
 #include "tracker-dbus.h"
+#include "tracker-miner-manager.h"
 
 typedef struct {
        TrackerSparqlConnection *connection;
diff --git a/src/tracker/tracker-index.c b/src/tracker/tracker-index.c
index a759c40c3..fc52c990d 100644
--- a/src/tracker/tracker-index.c
+++ b/src/tracker/tracker-index.c
@@ -30,11 +30,11 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 
-#include <libtracker-control/tracker-control.h>
 #include <libtracker-sparql/tracker-sparql.h>
 
 #include "tracker-index.h"
 #include "tracker-dbus.h"
+#include "tracker-miner-manager.h"
 
 static gchar **reindex_mime_types;
 static gboolean index_file;
diff --git a/src/libtracker-control/tracker-miner-manager.c b/src/tracker/tracker-miner-manager.c
similarity index 99%
rename from src/libtracker-control/tracker-miner-manager.c
rename to src/tracker/tracker-miner-manager.c
index c68be8d03..e9f5aafd1 100644
--- a/src/libtracker-control/tracker-miner-manager.c
+++ b/src/tracker/tracker-miner-manager.c
@@ -26,7 +26,6 @@
 #include <libtracker-common/tracker-dbus.h>
 #include <libtracker-common/tracker-type-utils.h>
 #include <libtracker-common/tracker-domain-ontology.h>
-#include <libtracker-miner/tracker-miner.h>
 
 #include "tracker-miner-manager.h"
 
@@ -49,6 +48,8 @@
 #define METHOD_INDEX_FILE "IndexFile"
 #define METHOD_INDEX_FILE_FOR_PROCESS "IndexFileForProcess"
 
+#define TRACKER_MINER_DBUS_INTERFACE "org.freedesktop.Tracker1.Miner"
+
 typedef struct TrackerMinerManagerPrivate TrackerMinerManagerPrivate;
 typedef struct MinerData MinerData;
 
diff --git a/src/libtracker-control/tracker-miner-manager.h b/src/tracker/tracker-miner-manager.h
similarity index 100%
rename from src/libtracker-control/tracker-miner-manager.h
rename to src/tracker/tracker-miner-manager.h
diff --git a/src/tracker/tracker-reset.c b/src/tracker/tracker-reset.c
index 8457f6261..7fb037dd7 100644
--- a/src/tracker/tracker-reset.c
+++ b/src/tracker/tracker-reset.c
@@ -29,13 +29,13 @@
 
 #include <libtracker-common/tracker-common.h>
 #include <libtracker-data/tracker-data.h>
-#include <libtracker-control/tracker-control.h>
 
 #include "tracker-reset.h"
 #include "tracker-daemon.h"
 #include "tracker-process.h"
 #include "tracker-config.h"
 #include "tracker-color.h"
+#include "tracker-miner-manager.h"
 
 static gboolean hard_reset;
 static gboolean soft_reset;
diff --git a/src/tracker/tracker-status.c b/src/tracker/tracker-status.c
index 3a5e28f7c..4cb16b2cd 100644
--- a/src/tracker/tracker-status.c
+++ b/src/tracker/tracker-status.c
@@ -31,10 +31,10 @@
 
 #include <libtracker-common/tracker-common.h>
 #include <libtracker-sparql/tracker-sparql.h>
-#include <libtracker-control/tracker-control.h>
 
 #include "tracker-status.h"
 #include "tracker-config.h"
+#include "tracker-miner-manager.h"
 
 #define STATUS_OPTIONS_ENABLED()         \
        (show_stat || \