[tracker/external-crawler: 31/42] libtracker-miner: Move TRACKER_MINER_DBUS_* definitions to tracker-miner-object.h

[Martyn James Russell <mr src gnome org>]

commit 6a01f625fe7723f7e96a7a3127adb61600f47b34
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Jun 13 13:26:07 2014 +0100

    libtracker-miner: Move TRACKER_MINER_DBUS_* definitions to tracker-miner-object.h
    
    There is no need for these to be in a separate header and also they're useful
    for other miners

 docs/reference/libtracker-miner/Makefile.am    |    1 -
 src/Makefile.am                                |    2 +-
 src/libtracker-control/tracker-miner-manager.c |    2 +-
 src/libtracker-miner/Makefile.am               |    1 -
 src/libtracker-miner/tracker-miner-dbus.h      |   37 ------------------------
 src/libtracker-miner/tracker-miner-object.c    |    1 -
 src/libtracker-miner/tracker-miner-object.h    |    5 +++
 src/miners/fs/tracker-miner-files-index.c      |    2 +-
 src/miners/fs/tracker-writeback-dispatcher.c   |    2 +-
 src/miners/fs/tracker-writeback-listener.c     |    2 +-
 10 files changed, 10 insertions(+), 45 deletions(-)
---
diff --git a/docs/reference/libtracker-miner/Makefile.am b/docs/reference/libtracker-miner/Makefile.am
index 967b48d..1b266cf 100644
--- a/docs/reference/libtracker-miner/Makefile.am
+++ b/docs/reference/libtracker-miner/Makefile.am
@@ -26,7 +26,6 @@ IGNORE_HFILES=                                         \
        tracker-file-notifier.h                        \
        tracker-file-system.h                          \
        tracker-miner-client.h                         \
-       tracker-miner-dbus.h                           \
        tracker-miner-glue.h                           \
        tracker-miner-files-index-client.h             \
        tracker-miner-fs-processing-pool.h             \
diff --git a/src/Makefile.am b/src/Makefile.am
index c1c26fc..ebe7314 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,12 +13,12 @@ SUBDIRS =                                              \
        libtracker-sparql                              \
        $(libtrackerfts_dir)                           \
        libtracker-bus                                 \
-       libtracker-control                             \
        libtracker-data                                \
        libtracker-direct                              \
        libtracker-sparql-backend                      \
        libtracker-extract                             \
        libtracker-miner                               \
+       libtracker-control                             \
        miners                                         \
        plugins                                        \
        tracker-store                                  \
diff --git a/src/libtracker-control/tracker-miner-manager.c b/src/libtracker-control/tracker-miner-manager.c
index b9d38bd..573b201 100644
--- a/src/libtracker-control/tracker-miner-manager.c
+++ b/src/libtracker-control/tracker-miner-manager.c
@@ -24,7 +24,7 @@
 
 #include <libtracker-common/tracker-dbus.h>
 #include <libtracker-common/tracker-type-utils.h>
-#include <libtracker-miner/tracker-miner-dbus.h>
+#include <libtracker-miner/tracker-miner.h>
 
 #include "tracker-miner-manager.h"
 
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index be1eaea..e65cb76 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -68,7 +68,6 @@ miner_sources =                                      \
        tracker-decorator-fs.h                         \
        tracker-indexing-tree.c                        \
        tracker-indexing-tree.h                        \
-       tracker-miner-dbus.h                           \
        tracker-miner-enum-types.c                     \
        tracker-miner-enum-types.h                     \
        tracker-miner-object.c                         \
diff --git a/src/libtracker-miner/tracker-miner-object.c b/src/libtracker-miner/tracker-miner-object.c
index 10dbb29..470f84f 100644
--- a/src/libtracker-miner/tracker-miner-object.c
+++ b/src/libtracker-miner/tracker-miner-object.c
@@ -27,7 +27,6 @@
 #include <libtracker-common/tracker-type-utils.h>
 
 #include "tracker-miner-object.h"
-#include "tracker-miner-dbus.h"
 
 /* Here we use ceil() to eliminate decimal points beyond what we're
  * interested in, which is 2 decimal places for the progress. The
diff --git a/src/libtracker-miner/tracker-miner-object.h b/src/libtracker-miner/tracker-miner-object.h
index a85786e..8d358ba 100644
--- a/src/libtracker-miner/tracker-miner-object.h
+++ b/src/libtracker-miner/tracker-miner-object.h
@@ -31,6 +31,11 @@
 
 G_BEGIN_DECLS
 
+/* Common definitions for all miners */
+#define TRACKER_MINER_DBUS_INTERFACE   "org.freedesktop.Tracker1.Miner"
+#define TRACKER_MINER_DBUS_NAME_PREFIX "org.freedesktop.Tracker1.Miner."
+#define TRACKER_MINER_DBUS_PATH_PREFIX "/org/freedesktop/Tracker1/Miner/"
+
 #define TRACKER_TYPE_MINER         (tracker_miner_get_type())
 #define TRACKER_MINER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_MINER, TrackerMiner))
 #define TRACKER_MINER_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c),    TRACKER_TYPE_MINER, TrackerMinerClass))
diff --git a/src/miners/fs/tracker-miner-files-index.c b/src/miners/fs/tracker-miner-files-index.c
index d5239b2..b507e32 100644
--- a/src/miners/fs/tracker-miner-files-index.c
+++ b/src/miners/fs/tracker-miner-files-index.c
@@ -21,7 +21,7 @@
 
 #include <libtracker-common/tracker-dbus.h>
 #include <libtracker-sparql/tracker-sparql.h>
-#include <libtracker-miner/tracker-miner-dbus.h>
+#include <libtracker-miner/tracker-miner.h>
 
 #include "tracker-miner-files-index.h"
 
diff --git a/src/miners/fs/tracker-writeback-dispatcher.c b/src/miners/fs/tracker-writeback-dispatcher.c
index 4d6d54b..1d0c5fb 100644
--- a/src/miners/fs/tracker-writeback-dispatcher.c
+++ b/src/miners/fs/tracker-writeback-dispatcher.c
@@ -21,7 +21,7 @@
 
 #include <libtracker-common/tracker-dbus.h>
 #include <libtracker-sparql/tracker-sparql.h>
-#include <libtracker-miner/tracker-miner-dbus.h>
+#include <libtracker-miner/tracker-miner.h>
 
 #include "tracker-writeback-dispatcher.h"
 
diff --git a/src/miners/fs/tracker-writeback-listener.c b/src/miners/fs/tracker-writeback-listener.c
index e37ad99..55e1871 100644
--- a/src/miners/fs/tracker-writeback-listener.c
+++ b/src/miners/fs/tracker-writeback-listener.c
@@ -21,7 +21,7 @@
 
 #include <libtracker-common/tracker-dbus.h>
 #include <libtracker-sparql/tracker-sparql.h>
-#include <libtracker-miner/tracker-miner-dbus.h>
+#include <libtracker-miner/tracker-miner.h>
 
 #include "tracker-writeback-listener.h"