GNOME.org
 

[tracker/api-cleanup: 9/16] libtracker-control: New separate library, just contains TrackerMinerManager

commit da0848f6dbb1f389836f1332a3b1e672dc183fcf
Author: Carlos Garnacho <carlosg gnome org>
Date:   Wed Feb 19 23:25:43 2014 +0100

    libtracker-control: New separate library, just contains TrackerMinerManager
    
    TrackerMinerManager has been moved from libtracker-miner, so it remains a library
    to implement miners. libtracker-control will be of interest to anything that
    attempts to track or control the state of running/available miners.

 configure.ac                                       |    4 +
 data/Makefile.am                                   |    5 +
 data/tracker-control.pc.in                         |   11 ++
 docs/reference/Makefile.am                         |    1 +
 docs/reference/libtracker-control/Makefile.am      |   59 +++++++
 .../libtracker-control-docs.sgml                   |   35 ++++
 .../libtracker-control/libtracker-control.types    |    1 +
 docs/reference/libtracker-control/version.xml.in   |    1 +
 .../libtracker-miner/libtracker-miner-sections.txt |   35 ----
 .../libtracker-miner/libtracker-miner.types        |    1 -
 src/Makefile.am                                    |    1 +
 src/libtracker-control/Makefile.am                 |   87 ++++++++++
 src/libtracker-control/tracker-control.deps        |    1 +
 src/libtracker-control/tracker-control.h           |   29 ++++
 src/libtracker-control/tracker-control.vapi        |   42 +++++
 .../tracker-miner-manager.c                        |    3 +-
 .../tracker-miner-manager.h                        |    2 +-
 src/libtracker-miner/Makefile.am                   |    3 -
 src/libtracker-miner/tracker-miner-dbus.h          |    2 -
 src/libtracker-miner/tracker-miner.h               |    1 -
 src/libtracker-miner/tracker-miner.vapi            |   20 ---
 src/tracker-control/Makefile.am                    |    1 +
 src/tracker-control/tracker-control-general.c      |    1 +
 src/tracker-control/tracker-control-miners.c       |    1 +
 src/tracker-control/tracker-control-status.c       |    1 +
 tests/libtracker-miner/Makefile.am                 |   10 -
 .../libtracker-miner/tracker-miner-manager-test.c  |  177 --------------------
 27 files changed, 284 insertions(+), 251 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6b6adb1..60280a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2511,12 +2511,15 @@ AC_CONFIG_FILES([
        data/Makefile
        data/miners/Makefile
        data/ontologies/Makefile
+       data/tracker-control.pc
        data/tracker-sparql.pc
        data/tracker-miner.pc
        docs/Makefile
        docs/design/Makefile
        docs/manpages/Makefile
        docs/reference/Makefile
+       docs/reference/libtracker-control/Makefile
+       docs/reference/libtracker-control/version.xml
        docs/reference/libtracker-sparql/Makefile
        docs/reference/libtracker-sparql/version.xml
        docs/reference/libtracker-miner/Makefile
@@ -2531,6 +2534,7 @@ AC_CONFIG_FILES([
        src/libtracker-common/Makefile
        src/libtracker-sparql/Makefile
        src/libtracker-bus/Makefile
+       src/libtracker-control/Makefile
        src/libtracker-data/Makefile
        src/libtracker-direct/Makefile
        src/libtracker-sparql-backend/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index f053c18..11ace09 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -44,9 +44,13 @@ endif
 # Set up pkg-config .pc files for exported libraries
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA =                                       \
+       tracker-control-$(TRACKER_API_VERSION).pc      \
        tracker-sparql-$(TRACKER_API_VERSION).pc       \
        tracker-miner-$(TRACKER_API_VERSION).pc
 
+tracker-control-$(TRACKER_API_VERSION).pc: tracker-control.pc
+       cp $< $@
+
 tracker-sparql-$(TRACKER_API_VERSION).pc: tracker-sparql.pc
        cp $< $@
 
@@ -56,6 +60,7 @@ tracker-miner-$(TRACKER_API_VERSION).pc: tracker-miner.pc
 CLEANFILES =                                           \
        $(autostart_DATA)                              \
        $(desktop_in_files)                            \
+       tracker-control-$(TRACKER_API_VERSION).pc      \
        tracker-sparql-$(TRACKER_API_VERSION).pc       \
        tracker-extract-$(TRACKER_API_VERSION).pc      \
        tracker-miner-$(TRACKER_API_VERSION).pc
diff --git a/data/tracker-control.pc.in b/data/tracker-control.pc.in
new file mode 100644
index 0000000..cb7529c
--- /dev/null
+++ b/data/tracker-control.pc.in
@@ -0,0 +1,11 @@
+prefix= prefix@
+exec_prefix= exec_prefix@
+libdir= libdir@
+includedir= includedir@
+
+Name: tracker-control
+Description: A library to monitor/control tracker miners
+Version: @VERSION@
+Requires: glib-2.0 gio-2.0
+Libs: -L${libdir} -ltracker-control- TRACKER_API_VERSION@
+Cflags: -I${includedir}/tracker- TRACKER_API_VERSION@
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 0402e5b..ca02fbe 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -1,6 +1,7 @@
 include $(top_srcdir)/Makefile.decl
 
 SUBDIRS =                                              \
+       libtracker-control                             \
        libtracker-sparql                              \
        libtracker-miner
 
diff --git a/docs/reference/libtracker-control/Makefile.am b/docs/reference/libtracker-control/Makefile.am
new file mode 100644
index 0000000..565d6c7
--- /dev/null
+++ b/docs/reference/libtracker-control/Makefile.am
@@ -0,0 +1,59 @@
+include $(top_srcdir)/Makefile.decl
+
+AUTOMAKE_OPTIONS = 1.6
+
+# The name of the module.
+DOC_MODULE=libtracker-control
+
+# The top-level SGML file.
+DOC_MAIN_SGML_FILE=libtracker-control-docs.sgml
+
+# Extra options to supply to gtkdoc-scan
+SCAN_OPTIONS=--deprecated-guards="TRACKER_DISABLE_DEPRECATED"
+
+# Extra options to pass to gtkdoc-scangobj
+# SCANGOBJ_OPTIONS=--type-init-func="gtk_type_init(0)"
+
+# The directory containing the source code. Relative to $(srcdir)
+DOC_SOURCE_DIR=../../../src/libtracker-control
+
+# Used for dependencies
+HFILE_GLOB=$(top_srcdir)/src/libtracker-control/*.h
+CFILE_GLOB=$(top_srcdir)/src/libtracker-control/*.c
+
+# Header files to ignore when scanning
+IGNORE_HFILES= 
+
+# CFLAGS and LDFLAGS for compiling scan program. Only needed
+# if $(DOC_MODULE).types is non-empty.
+AM_CPPFLAGS =                                          \
+       -DTRACKER_COMPILATION                          \
+       -I$(top_srcdir)/src                            \
+       $(LIBTRACKER_MINER_CFLAGS)
+
+GTKDOC_LIBS =                                          \
+       $(top_builddir)/src/libtracker-control/libtracker-control- TRACKER_API_VERSION@.la \
+       $(top_builddir)/src/libtracker-common/libtracker-common.la \
+       $(LIBTRACKER_MINER_LIBS)
+
+# Extra options to supply to gtkdoc-mkdb
+MKDB_OPTIONS=--sgml-mode --output-format=xml
+
+# Extra options to supply to gtkdoc-mkhtml
+MKHTML_OPTIONS=--path="$(abs_builddir)"
+
+# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
+content_files = version.xml
+
+expand_content_files =
+
+# Images to copy into HTML directory
+HTML_IMAGES =
+
+# Extra options to supply to gtkdoc-fixref
+FIXXREF_OPTIONS=
+
+include $(top_srcdir)/gtk-doc.make
+
+# Other files to distribute
+EXTRA_DIST += version.xml.in
diff --git a/docs/reference/libtracker-control/libtracker-control-docs.sgml 
b/docs/reference/libtracker-control/libtracker-control-docs.sgml
new file mode 100644
index 0000000..2db6352
--- /dev/null
+++ b/docs/reference/libtracker-control/libtracker-control-docs.sgml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [
+<!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
+<!ENTITY version SYSTEM "version.xml">
+]>
+<book id="index">
+  <bookinfo>
+    <title>Tracker Control Library Reference Manual</title>
+    <releaseinfo>
+         for libtracker-control &version;.
+         The latest version of this documentation can be found on-line at
+         <ulink role="online-location" url="http://library.gnome.org/devel/libtracker-miner/unstable/";>
+               http://library.gnome.org/devel/libtracker-control/unstable
+         </ulink>.
+       </releaseinfo>
+  </bookinfo>
+
+  <!-- The API Reference -->
+  <part id="libtracker-miner-reference">
+    <title>Reference</title>
+    <partintro>
+      <para>
+        This section provides the detailed API of the Tracker Miner library.
+      </para>
+    </partintro>
+
+    <chapter>
+      <title>Tracker control objects</title>
+      <xi:include href="xml/tracker-miner-manager.xml"/>
+    </chapter>
+  </part>
+
+  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
+</book>
diff --git a/docs/reference/libtracker-control/libtracker-control.types 
b/docs/reference/libtracker-control/libtracker-control.types
new file mode 100644
index 0000000..41246e0
--- /dev/null
+++ b/docs/reference/libtracker-control/libtracker-control.types
@@ -0,0 +1 @@
+tracker_miner_manager_get_type
diff --git a/docs/reference/libtracker-control/version.xml.in 
b/docs/reference/libtracker-control/version.xml.in
new file mode 100644
index 0000000..c7e1225
--- /dev/null
+++ b/docs/reference/libtracker-control/version.xml.in
@@ -0,0 +1 @@
+ TRACKER_VERSION@
diff --git a/docs/reference/libtracker-miner/libtracker-miner-sections.txt 
b/docs/reference/libtracker-miner/libtracker-miner-sections.txt
index d34ba11..41c7f50 100644
--- a/docs/reference/libtracker-miner/libtracker-miner-sections.txt
+++ b/docs/reference/libtracker-miner/libtracker-miner-sections.txt
@@ -97,41 +97,6 @@ tracker_miner_fs_get_type
 </SECTION>
 
 <SECTION>
-<FILE>tracker-miner-manager</FILE>
-<TITLE>TrackerMinerManager</TITLE>
-TRACKER_MINER_MANAGER_ERROR
-TrackerMinerManager
-TrackerMinerManagerClass
-TrackerMinerManagerError
-tracker_miner_manager_error_quark
-tracker_miner_manager_get_available
-tracker_miner_manager_get_description
-tracker_miner_manager_get_display_name
-tracker_miner_manager_get_running
-tracker_miner_manager_get_status
-tracker_miner_manager_ignore_next_update
-tracker_miner_manager_index_file
-tracker_miner_manager_index_file_async
-tracker_miner_manager_index_file_finish
-tracker_miner_manager_is_active
-tracker_miner_manager_is_paused
-tracker_miner_manager_new
-tracker_miner_manager_new_full
-tracker_miner_manager_pause
-tracker_miner_manager_pause_for_process
-tracker_miner_manager_reindex_by_mimetype
-tracker_miner_manager_resume
-<SUBSECTION Standard>
-TRACKER_IS_MINER_MANAGER
-TRACKER_IS_MINER_MANAGER_CLASS
-TRACKER_MINER_MANAGER
-TRACKER_MINER_MANAGER_CLASS
-TRACKER_MINER_MANAGER_GET_CLASS
-TRACKER_TYPE_MINER_MANAGER
-tracker_miner_manager_get_type
-</SECTION>
-
-<SECTION>
 <FILE>tracker-miner-object</FILE>
 <TITLE>TrackerMiner</TITLE>
 TRACKER_MINER_ERROR
diff --git a/docs/reference/libtracker-miner/libtracker-miner.types 
b/docs/reference/libtracker-miner/libtracker-miner.types
index 035a588..0ddac01 100644
--- a/docs/reference/libtracker-miner/libtracker-miner.types
+++ b/docs/reference/libtracker-miner/libtracker-miner.types
@@ -1,5 +1,4 @@
 tracker_decorator_fs_get_type
 tracker_indexing_tree_get_type
-tracker_miner_manager_get_type
 tracker_miner_get_type
 tracker_miner_fs_get_type
diff --git a/src/Makefile.am b/src/Makefile.am
index de3c005..f0b3e93 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,6 +15,7 @@ SUBDIRS =                                              \
        libtracker-sparql                              \
        $(libtrackerfts_dir)                           \
        libtracker-bus                                 \
+       libtracker-control                             \
        libtracker-data                                \
        libtracker-direct                              \
        libtracker-sparql-backend                      \
diff --git a/src/libtracker-control/Makefile.am b/src/libtracker-control/Makefile.am
new file mode 100644
index 0000000..1a59774
--- /dev/null
+++ b/src/libtracker-control/Makefile.am
@@ -0,0 +1,87 @@
+include $(top_srcdir)/Makefile.decl
+
+AM_CPPFLAGS =                                          \
+       $(BUILD_CFLAGS)                                \
+       -I$(top_srcdir)/src                            \
+       -I$(top_builddir)/src                          \
+       -DSHAREDIR=\""$(datadir)"\"                    \
+       -DTRACKER_MINERS_DIR=\""$(datadir)/tracker/miners"\" \
+       $(LIBTRACKER_MINER_CFLAGS)
+
+lib_LTLIBRARIES = libtracker-control- TRACKER_API_VERSION@.la
+
+libtracker_controldir = $(libdir)/tracker-$(TRACKER_API_VERSION)
+libtracker_controlincludedir=$(includedir)/tracker-$(TRACKER_API_VERSION)/libtracker-control/
+
+libtracker_control_ TRACKER_API_VERSION@_la_SOURCES =    \
+       tracker-miner-manager.c                          \
+       tracker-miner-manager.h
+
+libtracker_controlinclude_HEADERS =                      \
+       tracker-control.h                                \
+       tracker-miner-manager.h
+
+libtracker_control_ TRACKER_API_VERSION@_la_LDFLAGS =    \
+       -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+if !ENABLE_GCOV 
+# Using enable_gcov instead of have_unit_test because when doing a release
+#  we disable gcov but NOT the unit tests
+libtracker_control_ TRACKER_API_VERSION@_la_LDFLAGS +=    \
+       -export-symbols-regex '^tracker_.*'
+endif
+
+libtracker_control_ TRACKER_API_VERSION@_la_LIBADD =     \
+       $(top_builddir)/src/libtracker-common/libtracker-common.la \
+       -lm                                              \
+       $(BUILD_LIBS)                                    \
+       $(LIBTRACKER_MINER_LIBS)
+
+# Vala bindings
+vapidir = $(datadir)/vala/vapi
+vapi_DATA =                                              \
+       tracker-control-$(TRACKER_API_VERSION).vapi      \
+       tracker-control-$(TRACKER_API_VERSION).deps
+
+tracker-control-$(TRACKER_API_VERSION).vapi: tracker-control.vapi
+       cp $< $@
+
+tracker-control-$(TRACKER_API_VERSION).deps: tracker-control.deps
+       cp $< $@
+
+EXTRA_DIST =                                           \
+       tracker-control.vapi                           \
+       tracker-control.deps
+
+# Introspection foo
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS = \
+       -I $(top_srcdir)/src \
+       -D TRACKER_COMPILATION \
+       --c-include="libtracker-control/tracker-control.h" \
+       --identifier-prefix=Tracker \
+       --symbol-prefix=tracker \
+       --warn-all
+
+if HAVE_INTROSPECTION
+INTROSPECTION_CFLAGS += $(AM_CPPFLAGS)
+introspection_sources = \
+       $(libtracker_control_ TRACKER_API_VERSION@_la_SOURCES)
+
+TrackerControl- TRACKER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) $(lib_LTLIBRARIES) Makefile
+TrackerControl_ TRACKER_API_VERSION_UNDERSCORES@_gir_INCLUDES = Gio-2.0
+TrackerControl_ TRACKER_API_VERSION_UNDERSCORES@_gir_CFLAGS = $(INCLUDES)
+TrackerControl_ TRACKER_API_VERSION_UNDERSCORES@_gir_NAMESPACE = "TrackerControl"
+TrackerControl_ TRACKER_API_VERSION_UNDERSCORES@_gir_LIBS = $(lib_LTLIBRARIES)
+TrackerControl_ TRACKER_API_VERSION_UNDERSCORES@_gir_FILES = $(introspection_sources)
+
+INTROSPECTION_GIRS += TrackerControl-$(TRACKER_API_VERSION).gir
+
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
+CLEANFILES = $(gir_DATA) $(typelib_DATA)
+endif
diff --git a/src/libtracker-control/tracker-control.deps b/src/libtracker-control/tracker-control.deps
new file mode 100644
index 0000000..cd10dfd
--- /dev/null
+++ b/src/libtracker-control/tracker-control.deps
@@ -0,0 +1 @@
+gio-2.0
diff --git a/src/libtracker-control/tracker-control.h b/src/libtracker-control/tracker-control.h
new file mode 100644
index 0000000..7055e30
--- /dev/null
+++ b/src/libtracker-control/tracker-control.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2014, Carlos Garnacho <carlosg gnome org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
+ */
+
+#ifndef __LIBTRACKER_CONTROL_H__
+#define __LIBTRACKER_CONTROL_H__
+
+#define __LIBTRACKER_CONTROL_H_INSIDE__
+
+#include <libtracker-control/tracker-miner-manager.h>
+
+#undef __LIBTRACKER_CONTROL_H_INSIDE__
+
+#endif /* __LIBTRACKER_CONTROL_H__ */
diff --git a/src/libtracker-control/tracker-control.vapi b/src/libtracker-control/tracker-control.vapi
new file mode 100644
index 0000000..ffd034f
--- /dev/null
+++ b/src/libtracker-control/tracker-control.vapi
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2014, Carlos Garnacho <carlosg gnome org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
+ */
+
+[CCode (cprefix = "Tracker", lower_case_cprefix = "tracker_")]
+namespace Tracker {
+       [CCode (cheader_filename = "libtracker-miner/tracker-miner.h")]
+       public class MinerManager : GLib.Object, GLib.Initable {
+               [CCode (has_construct_function = false)]
+               public MinerManager ();
+               public unowned GLib.SList get_available ();
+               public unowned string get_description (string miner);
+               public unowned string get_display_name (string miner);
+               public unowned GLib.SList get_running ();
+               public bool get_status (string miner, string status, double progress);
+               public bool ignore_next_update (string miner, string urls);
+               public bool is_active (string miner);
+               public bool is_paused (string miner, string[] applications, string[] reasons);
+               public bool pause (string miner, string reason, uint32 cookie);
+               public bool resume (string miner, uint32 cookie);
+               public virtual void miner_activated (string miner_name);
+               public virtual void miner_deactivated (string miner_name);
+               public virtual void miner_paused (string miner_name);
+               public virtual void miner_resumed (string miner_name);
+               public virtual void miner_progress (string miner_name, string status, double progress);
+       }
+}
diff --git a/src/libtracker-miner/tracker-miner-manager.c b/src/libtracker-control/tracker-miner-manager.c
similarity index 99%
rename from src/libtracker-miner/tracker-miner-manager.c
rename to src/libtracker-control/tracker-miner-manager.c
index 3467d9c..595c90a 100644
--- a/src/libtracker-miner/tracker-miner-manager.c
+++ b/src/libtracker-control/tracker-miner-manager.c
@@ -20,12 +20,13 @@
 #include "config.h"
 
 #include <gio/gio.h>
+#include <string.h>
 
 #include <libtracker-common/tracker-dbus.h>
 #include <libtracker-common/tracker-type-utils.h>
+#include <libtracker-miner/tracker-miner-dbus.h>
 
 #include "tracker-miner-manager.h"
-#include "tracker-miner-dbus.h"
 
 /**
  * SECTION:tracker-miner-manager
diff --git a/src/libtracker-miner/tracker-miner-manager.h b/src/libtracker-control/tracker-miner-manager.h
similarity index 99%
rename from src/libtracker-miner/tracker-miner-manager.h
rename to src/libtracker-control/tracker-miner-manager.h
index 69c841b..454bcc9 100644
--- a/src/libtracker-miner/tracker-miner-manager.h
+++ b/src/libtracker-control/tracker-miner-manager.h
@@ -20,7 +20,7 @@
 #ifndef __LIBTRACKER_MINER_MANAGER_H__
 #define __LIBTRACKER_MINER_MANAGER_H__
 
-#if !defined (__LIBTRACKER_MINER_H_INSIDE__) && !defined (TRACKER_COMPILATION)
+#if !defined (__LIBTRACKER_CONTROL_H_INSIDE__) && !defined (TRACKER_COMPILATION)
 #error "Only <libtracker-miner/tracker-miner.h> can be included directly."
 #endif
 
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index dc46eca..69037ab 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -67,8 +67,6 @@ miner_sources =                                      \
        tracker-miner-object.h                         \
        tracker-miner-fs.c                             \
        tracker-miner-fs.h                             \
-       tracker-miner-manager.c                        \
-       tracker-miner-manager.h                        \
        tracker-miner-web.c                            \
        tracker-miner-web.h                            
 
@@ -95,7 +93,6 @@ libtracker_minerinclude_HEADERS =                      \
        tracker-miner-enum-types.h                     \
        tracker-miner-object.h                         \
        tracker-miner-fs.h                             \
-       tracker-miner-manager.h                        \
        tracker-miner-web.h                            \
        tracker-network-provider.h                     \
        tracker-password-provider.h
diff --git a/src/libtracker-miner/tracker-miner-dbus.h b/src/libtracker-miner/tracker-miner-dbus.h
index cddc9ae..a4f0e61 100644
--- a/src/libtracker-miner/tracker-miner-dbus.h
+++ b/src/libtracker-miner/tracker-miner-dbus.h
@@ -26,8 +26,6 @@
 
 #include <glib-object.h>
 
-#include "tracker-miner-object.h"
-
 G_BEGIN_DECLS
 
 #define TRACKER_MINER_DBUS_INTERFACE   "org.freedesktop.Tracker1.Miner"
diff --git a/src/libtracker-miner/tracker-miner.h b/src/libtracker-miner/tracker-miner.h
index 1f7e9de..208a3db 100644
--- a/src/libtracker-miner/tracker-miner.h
+++ b/src/libtracker-miner/tracker-miner.h
@@ -29,7 +29,6 @@
 #include <libtracker-miner/tracker-miner-object.h>
 #include <libtracker-miner/tracker-miner-fs.h>
 #include <libtracker-miner/tracker-miner-web.h>
-#include <libtracker-miner/tracker-miner-manager.h>
 #include <libtracker-miner/tracker-miner-enums.h>
 #include <libtracker-miner/tracker-miner-enum-types.h>
 #include <libtracker-miner/tracker-indexing-tree.h>
diff --git a/src/libtracker-miner/tracker-miner.vapi b/src/libtracker-miner/tracker-miner.vapi
index 096e38e..b2ab287 100644
--- a/src/libtracker-miner/tracker-miner.vapi
+++ b/src/libtracker-miner/tracker-miner.vapi
@@ -63,26 +63,6 @@ namespace Tracker {
                public signal void finished (double elapsed, uint directories_found, uint 
directories_ignored, uint files_found, uint files_ignored);
        }
        [CCode (cheader_filename = "libtracker-miner/tracker-miner.h")]
-       public class MinerManager : GLib.Object, GLib.Initable {
-               [CCode (has_construct_function = false)]
-               public MinerManager ();
-               public unowned GLib.SList get_available ();
-               public unowned string get_description (string miner);
-               public unowned string get_display_name (string miner);
-               public unowned GLib.SList get_running ();
-               public bool get_status (string miner, string status, double progress);
-               public bool ignore_next_update (string miner, string urls);
-               public bool is_active (string miner);
-               public bool is_paused (string miner, string[] applications, string[] reasons);
-               public bool pause (string miner, string reason, uint32 cookie);
-               public bool resume (string miner, uint32 cookie);
-               public virtual void miner_activated (string miner_name);
-               public virtual void miner_deactivated (string miner_name);
-               public virtual void miner_paused (string miner_name);
-               public virtual void miner_resumed (string miner_name);
-               public virtual void miner_progress (string miner_name, string status, double progress);
-       }
-       [CCode (cheader_filename = "libtracker-miner/tracker-miner.h")]
        public class MinerWeb : Tracker.Miner, GLib.Initable {
                [CCode (has_construct_function = false)]
                public MinerWeb ();
diff --git a/src/tracker-control/Makefile.am b/src/tracker-control/Makefile.am
index 6bcb0f2..751466c 100644
--- a/src/tracker-control/Makefile.am
+++ b/src/tracker-control/Makefile.am
@@ -17,6 +17,7 @@ tracker_control_SOURCES = \
        tracker-control.c
 
 tracker_control_LDADD = \
+       $(top_builddir)/src/libtracker-control/libtracker-control- TRACKER_API_VERSION@.la \
        $(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la \
        $(top_builddir)/src/libtracker-sparql-backend/libtracker-sparql- TRACKER_API_VERSION@.la \
        $(top_builddir)/src/libtracker-data/libtracker-data.la \
diff --git a/src/tracker-control/tracker-control-general.c b/src/tracker-control/tracker-control-general.c
index c05594a..7304c77 100644
--- a/src/tracker-control/tracker-control-general.c
+++ b/src/tracker-control/tracker-control-general.c
@@ -31,6 +31,7 @@
 #include <libtracker-common/tracker-common.h>
 #include <libtracker-data/tracker-data.h>
 #include <libtracker-miner/tracker-miner.h>
+#include <libtracker-control/tracker-control.h>
 
 #include "tracker-control.h"
 
diff --git a/src/tracker-control/tracker-control-miners.c b/src/tracker-control/tracker-control-miners.c
index 176152d..cf60b73 100644
--- a/src/tracker-control/tracker-control-miners.c
+++ b/src/tracker-control/tracker-control-miners.c
@@ -23,6 +23,7 @@
 
 #include <libtracker-common/tracker-common.h>
 #include <libtracker-miner/tracker-miner.h>
+#include <libtracker-control/tracker-control.h>
 
 #include "tracker-control.h"
 
diff --git a/src/tracker-control/tracker-control-status.c b/src/tracker-control/tracker-control-status.c
index 9e11cd8..bbf3227 100644
--- a/src/tracker-control/tracker-control-status.c
+++ b/src/tracker-control/tracker-control-status.c
@@ -23,6 +23,7 @@
 
 #include <libtracker-common/tracker-common.h>
 #include <libtracker-miner/tracker-miner.h>
+#include <libtracker-control/tracker-control.h>
 
 #include "tracker-control.h"
 
diff --git a/tests/libtracker-miner/Makefile.am b/tests/libtracker-miner/Makefile.am
index b1d0631..3ccb267 100644
--- a/tests/libtracker-miner/Makefile.am
+++ b/tests/libtracker-miner/Makefile.am
@@ -18,7 +18,6 @@ TEST_PROGS +=                                          \
        tracker-crawler-test                           \
        tracker-file-notifier-test                     \
        tracker-file-system-test                       \
-       tracker-miner-manager-test                     \
        tracker-password-provider-test                 \
        tracker-thumbnailer-test                       \
        tracker-monitor-test                           \
@@ -69,15 +68,6 @@ tracker_crawler_test_SOURCES = \
        $(libtracker_miner_crawler_headers) \
        tracker-crawler-test.c
 
-tracker_miner_manager_test_SOURCES = \
-       tracker-miner-manager-test.c \
-       miners-mock.c \
-       empty-gobject.c
-
-tracker_miner_manager_test_LDADD = \
-       libtracker-miner-tests.la \
-       $(LDADD)
-
 tracker_password_provider_test_SOURCES = \
        tracker-password-provider-test.c
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]