[tracker] libtracker-miner: Don't list Miner.Files.Reindex interface



commit b25bad720b2bf02c59a57eb9ec4620159f5f47b6
Author: Martyn Russell <martyn lanedo com>
Date:   Mon Feb 1 19:09:03 2010 +0000

    libtracker-miner: Don't list Miner.Files.Reindex interface

 data/dbus/Makefile.am                        |    7 +++++--
 src/libtracker-miner/tracker-miner-manager.c |   13 +++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/data/dbus/Makefile.am b/data/dbus/Makefile.am
index aeb4149..929c478 100644
--- a/data/dbus/Makefile.am
+++ b/data/dbus/Makefile.am
@@ -6,12 +6,14 @@ config_DATA =							\
 	tracker-backup.xml					\
 	tracker-extract.xml					\
 	tracker-miner.xml					\
-	tracker-miner-files-reindex.xml				\
 	tracker-resources.xml					\
 	tracker-resources-class.xml				\
 	tracker-statistics.xml					\
 	tracker-writeback.xml
 
+config_noinst =
+	tracker-miner-files-reindex.xml
+
 # Services
 servicedir = $(DBUS_SERVICES_DIR)
 service_in_files =						\
@@ -26,6 +28,7 @@ service_DATA = $(service_in_files:.service.in=.service)
 
 EXTRA_DIST = 							\
 	$(service_in_files)					\
-	$(config_DATA)
+	$(config_DATA)						\
+	$(config_noinst)
 
 CLEANFILES = $(service_DATA)
diff --git a/src/libtracker-miner/tracker-miner-manager.c b/src/libtracker-miner/tracker-miner-manager.c
index 22dc9c7..d462a48 100644
--- a/src/libtracker-miner/tracker-miner-manager.c
+++ b/src/libtracker-miner/tracker-miner-manager.c
@@ -437,9 +437,18 @@ tracker_miner_manager_get_running (TrackerMinerManager *manager)
 
 	if (result) {
 		for (p = result; *p; p++) {
-			if (g_str_has_prefix (*p, TRACKER_MINER_DBUS_NAME_PREFIX)) {
-				list = g_slist_prepend (list, g_strdup (*p));
+			if (!g_str_has_prefix (*p, TRACKER_MINER_DBUS_NAME_PREFIX)) {
+				continue;
 			}
+
+			/* Special case miner-fs which has
+			 * additional D-Bus interface.
+			 */
+			if (strcmp (*p, "org.freedesktop.Tracker1.Miner.Files.Reindex") == 0) {
+				continue;
+			}
+
+			list = g_slist_prepend (list, g_strdup (*p));
 		}
 
 		list = g_slist_reverse (list);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]