[tracker-miners/wip/carlosg/parallel-installable: 17/37] Update version in DBus interfaces and bus names
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker-miners/wip/carlosg/parallel-installable: 17/37] Update version in DBus interfaces and bus names
- Date: Sat, 14 Mar 2020 21:47:38 +0000 (UTC)
commit 1a70a825da2df35d0cd0e7f5c6f2c54e127c2e68
Author: Carlos Garnacho <carlosg gnome org>
Date: Sun Feb 23 19:15:32 2020 +0100
Update version in DBus interfaces and bus names
We now use Tracker3 everywhere.
docs/manpages/tracker-daemon.1 | 2 +-
po/POTFILES.in | 6 +++---
po/POTFILES.skip | 8 ++++----
src/create-miner-symlinks.sh | 6 +++---
src/libtracker-miner/tracker-miner-object.h | 10 +++++-----
src/libtracker-miner/tracker-miner-proxy.c | 6 +++---
src/libtracker-miner/tracker-miner.xml | 2 +-
src/miners/fs/meson.build | 6 +++---
...freedesktop.Tracker3.Miner.Files.service.in.in} | 4 ++--
src/miners/fs/tracker-extract-watchdog.c | 2 +-
src/miners/fs/tracker-main.c | 4 ++--
src/miners/fs/tracker-miner-files-index.c | 2 +-
src/miners/fs/tracker-miner-files-index.xml | 2 +-
src/miners/fs/tracker-miner-fs.service.in | 2 +-
src/miners/fs/tracker-writeback-dispatcher.c | 6 +++---
src/miners/fs/tracker-writeback-listener.c | 6 +++---
src/miners/rss/meson.build | 6 +++---
...g.freedesktop.Tracker3.Miner.RSS.service.in.in} | 4 ++--
src/miners/rss/tracker-main.c | 6 +++---
src/miners/rss/tracker-miner-rss.service.in | 2 +-
src/tracker-extract/meson.build | 8 ++++----
...eedesktop.Tracker3.Miner.Extract.service.in.in} | 4 ++--
src/tracker-extract/tracker-extract-controller.c | 14 +++++++-------
src/tracker-extract/tracker-extract-decorator.c | 2 +-
src/tracker-extract/tracker-extract-priority.xml | 2 +-
src/tracker-extract/tracker-extract.h | 6 +++---
src/tracker-extract/tracker-extract.service.in | 2 +-
src/tracker-extract/tracker-main.c | 6 +++---
src/tracker-writeback/meson.build | 4 ++--
... org.freedesktop.Tracker3.Writeback.service.in} | 2 +-
src/tracker-writeback/tracker-writeback.c | 10 +++++-----
src/tracker-writeback/tracker-writeback.service.in | 2 +-
src/tracker-writeback/tracker-writeback.xml | 11 +----------
src/tracker/tracker-daemon.c | 14 +++++++-------
src/tracker/tracker-index.c | 14 +++++++-------
src/tracker/tracker-miner-manager.c | 22 +++++++++++-----------
src/tracker/tracker-reset.c | 2 +-
src/tracker/tracker-search.c | 2 +-
src/tracker/tracker-status.c | 6 +++---
src/tracker/tracker-tag.c | 2 +-
tests/estress/abstract_engine.py | 4 ++--
tests/estress/abstract_text_engine.py | 6 +++---
tests/estress/client.py | 6 +++---
tests/functional-tests/minerfshelper.py | 12 ++++++------
tests/libtracker-miner/miners-mock.h | 4 ++--
.../mock-miners/mock-miner-1.desktop | 4 ++--
.../mock-miners/mock-miner-2.desktop | 4 ++--
tests/services/meson.build | 12 ++++++------
tests/services/miners/meson.build | 8 ++++----
....freedesktop.Tracker3.Miner.Extract.service.in} | 4 ++--
...rg.freedesktop.Tracker3.Miner.Files.service.in} | 4 ++--
... org.freedesktop.Tracker3.Writeback.service.in} | 2 +-
52 files changed, 144 insertions(+), 153 deletions(-)
---
diff --git a/docs/manpages/tracker-daemon.1 b/docs/manpages/tracker-daemon.1
index 66432f27f..ebc9914c8 100644
--- a/docs/manpages/tracker-daemon.1
+++ b/docs/manpages/tracker-daemon.1
@@ -215,7 +215,7 @@ requested the pause too.
.B \-\-miner\fR=<\fIminer\fR>
This argument is used with \fB\-\-pause\fR or \fB\-\-resume\fR to say
which miner you want to pause or resume. You can use the full D-Bus
-name, e.g. "org.freedesktop.Tracker1.Miner.Files" OR you can use
+name, e.g. "org.freedesktop.Tracker3.Miner.Files" OR you can use
the suffix, e.g. "Files".
.TP
.B \-\-pause\fR=<\fIreason\fR>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1863c61f9..c8357b83e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,15 +8,15 @@ src/libtracker-miners-common/tracker-dbus.c
src/libtracker-miners-common/tracker-utils.c
src/libtracker-miner/tracker-data-provider.c
src/libtracker-miner/tracker-miner-proxy.c
-src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in.in
+src/miners/fs/org.freedesktop.Tracker3.Miner.Files.service.in.in
src/miners/fs/tracker-main.c
src/miners/fs/tracker-miner-files.c
src/miners/fs/tracker-miner-fs.desktop.in.in
-src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in.in
+src/miners/rss/org.freedesktop.Tracker3.Miner.RSS.service.in.in
src/miners/rss/tracker-main.c
src/miners/rss/tracker-miner-rss.c
src/miners/rss/tracker-miner-rss.desktop.in.in
-src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in.in
+src/tracker-extract/org.freedesktop.Tracker3.Miner.Extract.service.in.in
src/tracker-extract/tracker-extract.c
src/tracker-extract/tracker-extract.desktop.in.in
src/tracker-extract/tracker-main.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index d43624441..5375e41e5 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,10 +1,10 @@
# List of source files that should NOT be translated.
# Please keep this file sorted alphabetically.
-src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.in
-src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in
+src/miners/apps/org.freedesktop.Tracker3.Miner.Applications.service.in
+src/miners/fs/org.freedesktop.Tracker3.Miner.Files.service.in
src/miners/fs/tracker-miner-fs.desktop.in
-src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in
+src/miners/rss/org.freedesktop.Tracker3.Miner.RSS.service.in
src/miners/rss/tracker-miner-rss.desktop.in
-src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in
+src/tracker-extract/org.freedesktop.Tracker3.Miner.Extract.service.in
src/tracker-extract/tracker-extract.desktop.in
tests/
diff --git a/src/create-miner-symlinks.sh b/src/create-miner-symlinks.sh
index 5280a476e..c90ac843a 100644
--- a/src/create-miner-symlinks.sh
+++ b/src/create-miner-symlinks.sh
@@ -12,10 +12,10 @@ have_tracker_miner_fs="$3"
have_tracker_miner_rss="$4"
mkdir -p ${DESTDIR}/${tracker_miner_services_dir}
-ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Extract.service"
"${DESTDIR}/${tracker_miner_services_dir}/"
+ln -sf "${dbus_services_dir}/org.freedesktop.Tracker3.Miner.Extract.service"
"${DESTDIR}/${tracker_miner_services_dir}/"
if ([ "$have_tracker_miner_fs" = "true" ]); then
- ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.Files.service"
"${DESTDIR}/${tracker_miner_services_dir}/"
+ ln -sf "${dbus_services_dir}/org.freedesktop.Tracker3.Miner.Files.service"
"${DESTDIR}/${tracker_miner_services_dir}/"
fi
if ([ "$have_tracker_miner_rss" = "true" ]); then
- ln -sf "${dbus_services_dir}/org.freedesktop.Tracker1.Miner.RSS.service"
"${DESTDIR}/${tracker_miner_services_dir}/"
+ ln -sf "${dbus_services_dir}/org.freedesktop.Tracker3.Miner.RSS.service"
"${DESTDIR}/${tracker_miner_services_dir}/"
fi
diff --git a/src/libtracker-miner/tracker-miner-object.h b/src/libtracker-miner/tracker-miner-object.h
index 62513061b..bf26b50dd 100644
--- a/src/libtracker-miner/tracker-miner-object.h
+++ b/src/libtracker-miner/tracker-miner-object.h
@@ -40,7 +40,7 @@ G_BEGIN_DECLS
*
* Since: 0.8
**/
-#define TRACKER_MINER_DBUS_INTERFACE "org.freedesktop.Tracker1.Miner"
+#define TRACKER_MINER_DBUS_INTERFACE "org.freedesktop.Tracker3.Miner"
/**
* TRACKER_MINER_DBUS_NAME_PREFIX:
@@ -48,11 +48,11 @@ G_BEGIN_DECLS
* D-Bus name prefix to use for all data miners. This allows custom
* miners to be written using @TRACKER_MINER_DBUS_NAME_PREFIX + "Files" for
* example and would show up on D-Bus under
- * "org.freedesktop.Tracker1.Miner.Files".
+ * "org.freedesktop.Tracker3.Miner.Files".
*
* Since: 0.8
**/
-#define TRACKER_MINER_DBUS_NAME_PREFIX "org.freedesktop.Tracker1.Miner."
+#define TRACKER_MINER_DBUS_NAME_PREFIX "org.freedesktop.Tracker3.Miner."
/**
* TRACKER_MINER_DBUS_PATH_PREFIX:
@@ -60,11 +60,11 @@ G_BEGIN_DECLS
* D-Bus path prefix to use for all data miners. This allows custom
* miners to be written using @TRACKER_MINER_DBUS_PATH_PREFIX + "Files" for
* example and would show up on D-Bus under
- * "/org/freedesktop/Tracker1/Miner/Files".
+ * "/org/freedesktop/Tracker3/Miner/Files".
*
* Since: 0.8
**/
-#define TRACKER_MINER_DBUS_PATH_PREFIX "/org/freedesktop/Tracker1/Miner/"
+#define TRACKER_MINER_DBUS_PATH_PREFIX "/org/freedesktop/Tracker3/Miner/"
#define TRACKER_TYPE_MINER (tracker_miner_get_type())
#define TRACKER_MINER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_MINER, TrackerMiner))
diff --git a/src/libtracker-miner/tracker-miner-proxy.c b/src/libtracker-miner/tracker-miner-proxy.c
index e599ef64c..556384f06 100644
--- a/src/libtracker-miner/tracker-miner-proxy.c
+++ b/src/libtracker-miner/tracker-miner-proxy.c
@@ -24,7 +24,7 @@
* @short_description: Proxies a #TrackerMiner on DBus
* @include: libtracker-miner/tracker-miner.h
*
- * #TrackerMinerProxy is a helper object to expose org.freedesktop.Tracker1.Miner
+ * #TrackerMinerProxy is a helper object to expose org.freedesktop.Tracker3.Miner
* DBus interfaces for the given #TrackerMiner object. This is used to implement
* miners as DBus services.
*
@@ -77,7 +77,7 @@ G_DEFINE_TYPE_WITH_CODE (TrackerMinerProxy, tracker_miner_proxy, G_TYPE_OBJECT,
static const gchar introspection_xml[] =
"<node>"
- " <interface name='org.freedesktop.Tracker1.Miner'>"
+ " <interface name='org.freedesktop.Tracker3.Miner'>"
" <method name='Start'>"
" </method>"
" <method name='GetStatus'>"
@@ -118,7 +118,7 @@ static const gchar introspection_xml[] =
" </interface>"
"</node>";
-#define TRACKER_SERVICE "org.freedesktop.Tracker1"
+#define TRACKER_SERVICE "org.freedesktop.Tracker3"
static PauseData *
pause_data_new (const gchar *application,
diff --git a/src/libtracker-miner/tracker-miner.xml b/src/libtracker-miner/tracker-miner.xml
index f12c8a91b..6fe09c846 100644
--- a/src/libtracker-miner/tracker-miner.xml
+++ b/src/libtracker-miner/tracker-miner.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<node name="/">
- <interface name="org.freedesktop.Tracker1.Miner">
+ <interface name="org.freedesktop.Tracker3.Miner">
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="_tracker_miner_dbus"/>
<method name="Start">
<annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build
index ba5f5af79..67a0fa24a 100644
--- a/src/miners/fs/meson.build
+++ b/src/miners/fs/meson.build
@@ -35,13 +35,13 @@ executable('tracker-miner-fs', sources,
)
dbus_service_file_untranslated = configure_file(
- input: 'org.freedesktop.Tracker1.Miner.Files.service.in.in',
- output: 'org.freedesktop.Tracker1.Miner.Files.service.in',
+ input: 'org.freedesktop.Tracker3.Miner.Files.service.in.in',
+ output: 'org.freedesktop.Tracker3.Miner.Files.service.in',
configuration: conf)
dbus_service_file = custom_target('tracker-miner-files-dbus-service-file',
input: dbus_service_file_untranslated,
- output: 'org.freedesktop.Tracker1.Miner.Files.service',
+ output: 'org.freedesktop.Tracker3.Miner.Files.service',
command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(),
'po'), '@INPUT@', '@OUTPUT@'],
install: true,
install_dir: dbus_services_dir)
diff --git a/src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in.in
b/src/miners/fs/org.freedesktop.Tracker3.Miner.Files.service.in.in
similarity index 71%
rename from src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in.in
rename to src/miners/fs/org.freedesktop.Tracker3.Miner.Files.service.in.in
index a61719947..690f9a640 100644
--- a/src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in.in
+++ b/src/miners/fs/org.freedesktop.Tracker3.Miner.Files.service.in.in
@@ -1,10 +1,10 @@
[D-BUS Service]
-Name=org.freedesktop.Tracker1.Miner.Files
+Name=org.freedesktop.Tracker3.Miner.Files
Exec=@libexecdir@/tracker-miner-fs
SystemdService=tracker-miner-fs.service
# Miner details needed for tracker-control
-Path=/org/freedesktop/Tracker1/Miner/Files
+Path=/org/freedesktop/Tracker3/Miner/Files
NameSuffix=Miner.Files
_DisplayName=File System
_Comment=File system data miner
diff --git a/src/miners/fs/tracker-extract-watchdog.c b/src/miners/fs/tracker-extract-watchdog.c
index 21d069776..e6dd88421 100644
--- a/src/miners/fs/tracker-extract-watchdog.c
+++ b/src/miners/fs/tracker-extract-watchdog.c
@@ -105,7 +105,7 @@ extract_watchdog_start (TrackerExtractWatchdog *watchdog,
if (domain_name == NULL) {
tracker_extract_dbus_name = g_strdup (TRACKER_MINER_DBUS_NAME_PREFIX "Extract");
} else {
- tracker_extract_dbus_name = g_strconcat (domain_name, ".Tracker1.Miner.Extract", NULL);
+ tracker_extract_dbus_name = g_strconcat (domain_name, ".Tracker3.Miner.Extract", NULL);
}
watchdog->extractor_watchdog_id =
diff --git a/src/miners/fs/tracker-main.c b/src/miners/fs/tracker-main.c
index 894eda94f..77d93ba79 100644
--- a/src/miners/fs/tracker-main.c
+++ b/src/miners/fs/tracker-main.c
@@ -52,8 +52,8 @@
#define SECONDS_PER_DAY 60 * 60 * 24
-#define DBUS_NAME_SUFFIX "Tracker1.Miner.Files"
-#define DBUS_PATH "/org/freedesktop/Tracker1/Miner/Files"
+#define DBUS_NAME_SUFFIX "Tracker3.Miner.Files"
+#define DBUS_PATH "/org/freedesktop/Tracker3/Miner/Files"
#define LOCALE_FILENAME "locale-for-miner-apps.txt"
static GMainLoop *main_loop;
diff --git a/src/miners/fs/tracker-miner-files-index.c b/src/miners/fs/tracker-miner-files-index.c
index bb5ea164f..e2c3093af 100644
--- a/src/miners/fs/tracker-miner-files-index.c
+++ b/src/miners/fs/tracker-miner-files-index.c
@@ -29,7 +29,7 @@
static const gchar introspection_xml[] =
"<node>"
- " <interface name='org.freedesktop.Tracker1.Miner.Files.Index'>"
+ " <interface name='org.freedesktop.Tracker3.Miner.Files.Index'>"
" <method name='ReindexMimeTypes'>"
" <arg type='as' name='mime_types' direction='in' />"
" </method>"
diff --git a/src/miners/fs/tracker-miner-files-index.xml b/src/miners/fs/tracker-miner-files-index.xml
index 4e02ba3d7..47d91d24c 100644
--- a/src/miners/fs/tracker-miner-files-index.xml
+++ b/src/miners/fs/tracker-miner-files-index.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<node name="/">
- <interface name="org.freedesktop.Tracker1.Miner.Files.Index">
+ <interface name="org.freedesktop.Tracker3.Miner.Files.Index">
<method name="ReindexMimeTypes">
<annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
<arg type="as" name="mime_types" direction="in" />
diff --git a/src/miners/fs/tracker-miner-fs.service.in b/src/miners/fs/tracker-miner-fs.service.in
index fad973a04..d0c1646d2 100644
--- a/src/miners/fs/tracker-miner-fs.service.in
+++ b/src/miners/fs/tracker-miner-fs.service.in
@@ -3,7 +3,7 @@ Description=Tracker file system data miner
[Service]
Type=dbus
-BusName=org.freedesktop.Tracker1.Miner.Files
+BusName=org.freedesktop.Tracker3.Miner.Files
ExecStart=@libexecdir@/tracker-miner-fs
Restart=on-failure
# Don't restart after tracker daemon -k (aka tracker-control -k)
diff --git a/src/miners/fs/tracker-writeback-dispatcher.c b/src/miners/fs/tracker-writeback-dispatcher.c
index 0a2d45a51..376402427 100644
--- a/src/miners/fs/tracker-writeback-dispatcher.c
+++ b/src/miners/fs/tracker-writeback-dispatcher.c
@@ -25,9 +25,9 @@
#include "tracker-writeback-dispatcher.h"
#include "tracker-miner-files.h"
-#define TRACKER_WRITEBACK_SERVICE "org.freedesktop.Tracker1.Writeback"
-#define TRACKER_WRITEBACK_PATH "/org/freedesktop/Tracker1/Writeback"
-#define TRACKER_WRITEBACK_INTERFACE "org.freedesktop.Tracker1.Writeback"
+#define TRACKER_WRITEBACK_SERVICE "org.freedesktop.Tracker3.Writeback"
+#define TRACKER_WRITEBACK_PATH "/org/freedesktop/Tracker3/Writeback"
+#define TRACKER_WRITEBACK_INTERFACE "org.freedesktop.Tracker3.Writeback"
typedef struct {
GFile *file;
diff --git a/src/miners/fs/tracker-writeback-listener.c b/src/miners/fs/tracker-writeback-listener.c
index 8eb9b30ad..b8aefb9af 100644
--- a/src/miners/fs/tracker-writeback-listener.c
+++ b/src/miners/fs/tracker-writeback-listener.c
@@ -25,9 +25,9 @@
#include "tracker-writeback-listener.h"
#include "tracker-miner-files.h"
-#define TRACKER_SERVICE "org.freedesktop.Tracker1"
-#define TRACKER_RESOURCES_OBJECT "/org/freedesktop/Tracker1/Resources"
-#define TRACKER_INTERFACE_RESOURCES "org.freedesktop.Tracker1.Resources"
+#define TRACKER_SERVICE "org.freedesktop.Tracker3"
+#define TRACKER_RESOURCES_OBJECT "/org/freedesktop/Tracker3/Resources"
+#define TRACKER_INTERFACE_RESOURCES "org.freedesktop.Tracker3.Resources"
typedef struct {
gint32 subject_id;
diff --git a/src/miners/rss/meson.build b/src/miners/rss/meson.build
index 4f698f31d..a015ae4a5 100644
--- a/src/miners/rss/meson.build
+++ b/src/miners/rss/meson.build
@@ -12,13 +12,13 @@ executable('tracker-miner-rss', sources,
)
dbus_service_file_untranslated = configure_file(
- input: 'org.freedesktop.Tracker1.Miner.RSS.service.in.in',
- output: 'org.freedesktop.Tracker1.Miner.RSS.service.in',
+ input: 'org.freedesktop.Tracker3.Miner.RSS.service.in.in',
+ output: 'org.freedesktop.Tracker3.Miner.RSS.service.in',
configuration: conf)
dbus_service_file = custom_target('tracker-miner-rss-dbus-service-file',
input: dbus_service_file_untranslated,
- output: 'org.freedesktop.Tracker1.Miner.RSS.service',
+ output: 'org.freedesktop.Tracker3.Miner.RSS.service',
command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(),
'po'), '@INPUT@', '@OUTPUT@'],
install: true,
install_dir: dbus_services_dir)
diff --git a/src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in.in
b/src/miners/rss/org.freedesktop.Tracker3.Miner.RSS.service.in.in
similarity index 72%
rename from src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in.in
rename to src/miners/rss/org.freedesktop.Tracker3.Miner.RSS.service.in.in
index 372c21965..9296f979a 100644
--- a/src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in.in
+++ b/src/miners/rss/org.freedesktop.Tracker3.Miner.RSS.service.in.in
@@ -1,10 +1,10 @@
[D-BUS Service]
-Name=org.freedesktop.Tracker1.Miner.RSS
+Name=org.freedesktop.Tracker3.Miner.RSS
Exec=@libexecdir@/tracker-miner-rss
SystemdService=tracker-miner-rss.service
# Miner details needed for tracker-control
-Path=/org/freedesktop/Tracker1/Miner/RSS
+Path=/org/freedesktop/Tracker3/Miner/RSS
NameSuffix=Miner.RSS
_DisplayName=RSS/ATOM Feeds
_Comment=Fetch RSS/ATOM Feeds
diff --git a/src/miners/rss/tracker-main.c b/src/miners/rss/tracker-main.c
index b78f0303b..e55d53ab9 100644
--- a/src/miners/rss/tracker-main.c
+++ b/src/miners/rss/tracker-main.c
@@ -29,8 +29,8 @@
#include "tracker-miner-rss.h"
-#define DBUS_NAME_SUFFIX "Tracker1.Miner.RSS"
-#define DBUS_PATH "/org/freedesktop/Tracker1/Miner/RSS"
+#define DBUS_NAME_SUFFIX "Tracker3.Miner.RSS"
+#define DBUS_PATH "/org/freedesktop/Tracker3/Miner/RSS"
static gint verbosity = -1;
static gchar *add_feed;
@@ -172,7 +172,7 @@ main (int argc, char **argv)
title,
add_feed);
- connection = tracker_sparql_connection_bus_new ("org.freedesktop.Tracker1.Miner.RSS",
+ connection = tracker_sparql_connection_bus_new ("org.freedesktop.Tracker3.Miner.RSS",
NULL, NULL, &error);
if (!connection) {
diff --git a/src/miners/rss/tracker-miner-rss.service.in b/src/miners/rss/tracker-miner-rss.service.in
index 2bebf4cf5..6c96ea738 100644
--- a/src/miners/rss/tracker-miner-rss.service.in
+++ b/src/miners/rss/tracker-miner-rss.service.in
@@ -3,7 +3,7 @@ Description=Tracker RSS/ATOM feed data miner
[Service]
Type=dbus
-BusName=org.freedesktop.Tracker1.Miner.RSS
+BusName=org.freedesktop.Tracker3.Miner.RSS
ExecStart=@libexecdir@/tracker-miner-rss
Restart=on-failure
# Don't restart after tracker daemon -k (aka tracker-control -k)
diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build
index a730b3a8a..0c0ecfad7 100644
--- a/src/tracker-extract/meson.build
+++ b/src/tracker-extract/meson.build
@@ -137,7 +137,7 @@ endforeach
tracker_extract_priority_dbus = gnome.gdbus_codegen(
'tracker-extract-priority-dbus',
'tracker-extract-priority.xml',
- interface_prefix: 'org.freedesktop.Tracker1.Extract.',
+ interface_prefix: 'org.freedesktop.Tracker3.Extract.',
namespace: 'TrackerExtractDBus')
tracker_extract_sources = [
@@ -170,13 +170,13 @@ executable('tracker-extract',
install_rpath: tracker_install_rpath)
dbus_service_file_untranslated = configure_file(
- input: 'org.freedesktop.Tracker1.Miner.Extract.service.in.in',
- output: 'org.freedesktop.Tracker1.Miner.Extract.service.in',
+ input: 'org.freedesktop.Tracker3.Miner.Extract.service.in.in',
+ output: 'org.freedesktop.Tracker3.Miner.Extract.service.in',
configuration: conf)
dbus_service_file = custom_target('tracker-extract-dbus-service-file',
input: dbus_service_file_untranslated,
- output: 'org.freedesktop.Tracker1.Miner.Extract.service',
+ output: 'org.freedesktop.Tracker3.Miner.Extract.service',
command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'),
'@INPUT@', '@OUTPUT@'],
install: true,
install_dir: dbus_services_dir)
diff --git a/src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in.in
b/src/tracker-extract/org.freedesktop.Tracker3.Miner.Extract.service.in.in
similarity index 70%
rename from src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in.in
rename to src/tracker-extract/org.freedesktop.Tracker3.Miner.Extract.service.in.in
index 32dd1dfd0..7dd901e3d 100644
--- a/src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in.in
+++ b/src/tracker-extract/org.freedesktop.Tracker3.Miner.Extract.service.in.in
@@ -1,10 +1,10 @@
[D-BUS Service]
-Name=org.freedesktop.Tracker1.Miner.Extract
+Name=org.freedesktop.Tracker3.Miner.Extract
Exec=@libexecdir@/tracker-extract
SystemdService=tracker-extract.service
# Miner details needed for tracker-control
-Path=/org/freedesktop/Tracker1/Miner/Extract
+Path=/org/freedesktop/Tracker3/Miner/Extract
NameSuffix=Miner.Extract
_DisplayName=Extractor
_Comment=Metadata extractor
diff --git a/src/tracker-extract/tracker-extract-controller.c
b/src/tracker-extract/tracker-extract-controller.c
index 5e6adbd04..d7e79406a 100644
--- a/src/tracker-extract/tracker-extract-controller.c
+++ b/src/tracker-extract/tracker-extract-controller.c
@@ -97,9 +97,9 @@ appeared_cb (GDBusConnection *connection,
/* Get initial status */
self->priv->cancellable = g_cancellable_new ();
g_dbus_connection_call (connection,
- "org.freedesktop.Tracker1.Miner.Files",
- "/org/freedesktop/Tracker1/Miner/Files",
- "org.freedesktop.Tracker1.Miner",
+ "org.freedesktop.Tracker3.Miner.Files",
+ "/org/freedesktop/Tracker3/Miner/Files",
+ "org.freedesktop.Tracker3.Miner",
"GetStatus",
NULL,
G_VARIANT_TYPE ("(s)"),
@@ -171,10 +171,10 @@ update_wait_for_miner_fs (TrackerExtractController *self)
if (tracker_config_get_wait_for_miner_fs (self->priv->config)) {
self->priv->progress_signal_id =
g_dbus_connection_signal_subscribe (conn,
- "org.freedesktop.Tracker1.Miner.Files",
- "org.freedesktop.Tracker1.Miner",
+ "org.freedesktop.Tracker3.Miner.Files",
+ "org.freedesktop.Tracker3.Miner",
"Progress",
- "/org/freedesktop/Tracker1/Miner/Files",
+ "/org/freedesktop/Tracker3/Miner/Files",
NULL,
G_DBUS_SIGNAL_FLAGS_NONE,
files_miner_progress_cb,
@@ -183,7 +183,7 @@ update_wait_for_miner_fs (TrackerExtractController *self)
/* appeared_cb is guaranteed to be called even if the service
* was already running, so we'll start the miner from there. */
self->priv->watch_id = g_bus_watch_name_on_connection (conn,
- "org.freedesktop.Tracker1.Miner.Files",
+ "org.freedesktop.Tracker3.Miner.Files",
G_BUS_NAME_WATCHER_FLAGS_NONE,
appeared_cb,
vanished_cb,
diff --git a/src/tracker-extract/tracker-extract-decorator.c b/src/tracker-extract/tracker-extract-decorator.c
index ce87b7f1c..819b319ff 100644
--- a/src/tracker-extract/tracker-extract-decorator.c
+++ b/src/tracker-extract/tracker-extract-decorator.c
@@ -654,7 +654,7 @@ tracker_extract_decorator_initable_init (GInitable *initable,
if (!g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (priv->iface),
conn,
- "/org/freedesktop/Tracker1/Extract/Priority",
+ "/org/freedesktop/Tracker3/Extract/Priority",
error)) {
ret = FALSE;
goto out;
diff --git a/src/tracker-extract/tracker-extract-priority.xml
b/src/tracker-extract/tracker-extract-priority.xml
index 2220177cb..025e15be8 100644
--- a/src/tracker-extract/tracker-extract-priority.xml
+++ b/src/tracker-extract/tracker-extract-priority.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<node name="/">
- <interface name="org.freedesktop.Tracker1.Extract.Priority">
+ <interface name="org.freedesktop.Tracker3.Extract.Priority">
<method name="SetRdfTypes">
<arg type="as" name="rdf_types" direction="in" />
</method>
diff --git a/src/tracker-extract/tracker-extract.h b/src/tracker-extract/tracker-extract.h
index 3fb532bfc..bd88c3f9d 100644
--- a/src/tracker-extract/tracker-extract.h
+++ b/src/tracker-extract/tracker-extract.h
@@ -24,9 +24,9 @@
#include <libtracker-miners-common/tracker-common.h>
#include <libtracker-extract/tracker-extract.h>
-#define TRACKER_EXTRACT_SERVICE "org.freedesktop.Tracker1.Extract"
-#define TRACKER_EXTRACT_PATH "/org/freedesktop/Tracker1/Extract"
-#define TRACKER_EXTRACT_INTERFACE "org.freedesktop.Tracker1.Extract"
+#define TRACKER_EXTRACT_SERVICE "org.freedesktop.Tracker3.Extract"
+#define TRACKER_EXTRACT_PATH "/org/freedesktop/Tracker3/Extract"
+#define TRACKER_EXTRACT_INTERFACE "org.freedesktop.Tracker3.Extract"
G_BEGIN_DECLS
diff --git a/src/tracker-extract/tracker-extract.service.in b/src/tracker-extract/tracker-extract.service.in
index 1c6c716a2..4d5a3f269 100644
--- a/src/tracker-extract/tracker-extract.service.in
+++ b/src/tracker-extract/tracker-extract.service.in
@@ -3,7 +3,7 @@ Description=Tracker metadata extractor
[Service]
Type=dbus
-BusName=org.freedesktop.Tracker1.Miner.Extract
+BusName=org.freedesktop.Tracker3.Miner.Extract
ExecStart=@libexecdir@/tracker-extract
Restart=on-abnormal
# Don't restart after tracker daemon -k (aka tracker-control -k)
diff --git a/src/tracker-extract/tracker-main.c b/src/tracker-extract/tracker-main.c
index 849284dfe..21f1047b9 100644
--- a/src/tracker-extract/tracker-main.c
+++ b/src/tracker-extract/tracker-main.c
@@ -60,8 +60,8 @@
"\n" \
" http://www.gnu.org/licenses/gpl.txt\n";
-#define DBUS_NAME_SUFFIX "Tracker1.Miner.Extract"
-#define DBUS_PATH "/org/freedesktop/Tracker1/Miner/Extract"
+#define DBUS_NAME_SUFFIX "Tracker3.Miner.Extract"
+#define DBUS_PATH "/org/freedesktop/Tracker3/Miner/Extract"
static GMainLoop *main_loop;
@@ -409,7 +409,7 @@ main (int argc, char *argv[])
tracker_module_manager_load_modules ();
- dbus_name = tracker_domain_ontology_get_domain (domain_ontology, "Tracker1.Miner.Files");
+ dbus_name = tracker_domain_ontology_get_domain (domain_ontology, "Tracker3.Miner.Files");
sparql_connection = tracker_sparql_connection_bus_new (dbus_name,
NULL, NULL, &error);
diff --git a/src/tracker-writeback/meson.build b/src/tracker-writeback/meson.build
index 70bcf65cb..3270c22fc 100644
--- a/src/tracker-writeback/meson.build
+++ b/src/tracker-writeback/meson.build
@@ -50,8 +50,8 @@ executable('tracker-writeback',
install_rpath: tracker_install_rpath)
dbus_service_file = configure_file(
- input: 'org.freedesktop.Tracker1.Writeback.service.in',
- output: 'org.freedesktop.Tracker1.Writeback.service',
+ input: 'org.freedesktop.Tracker3.Writeback.service.in',
+ output: 'org.freedesktop.Tracker3.Writeback.service',
configuration: conf,
install: true,
install_dir: dbus_services_dir)
diff --git a/src/tracker-writeback/org.freedesktop.Tracker1.Writeback.service.in
b/src/tracker-writeback/org.freedesktop.Tracker3.Writeback.service.in
similarity index 69%
rename from src/tracker-writeback/org.freedesktop.Tracker1.Writeback.service.in
rename to src/tracker-writeback/org.freedesktop.Tracker3.Writeback.service.in
index 81a2ec271..45838280c 100644
--- a/src/tracker-writeback/org.freedesktop.Tracker1.Writeback.service.in
+++ b/src/tracker-writeback/org.freedesktop.Tracker3.Writeback.service.in
@@ -1,4 +1,4 @@
[D-BUS Service]
-Name=org.freedesktop.Tracker1.Writeback
+Name=org.freedesktop.Tracker3.Writeback
Exec=@libexecdir@/tracker-writeback
SystemdService=tracker-writeback.service
diff --git a/src/tracker-writeback/tracker-writeback.c b/src/tracker-writeback/tracker-writeback.c
index 600c03610..1a48bfd87 100644
--- a/src/tracker-writeback/tracker-writeback.c
+++ b/src/tracker-writeback/tracker-writeback.c
@@ -76,13 +76,13 @@ typedef struct {
WritebackData *current;
} TrackerControllerPrivate;
-#define TRACKER_WRITEBACK_SERVICE "org.freedesktop.Tracker1.Writeback"
-#define TRACKER_WRITEBACK_PATH "/org/freedesktop/Tracker1/Writeback"
-#define TRACKER_WRITEBACK_INTERFACE "org.freedesktop.Tracker1.Writeback"
+#define TRACKER_WRITEBACK_SERVICE "org.freedesktop.Tracker3.Writeback"
+#define TRACKER_WRITEBACK_PATH "/org/freedesktop/Tracker3/Writeback"
+#define TRACKER_WRITEBACK_INTERFACE "org.freedesktop.Tracker3.Writeback"
static const gchar *introspection_xml =
"<node>"
- " <interface name='org.freedesktop.Tracker1.Writeback'>"
+ " <interface name='org.freedesktop.Tracker3.Writeback'>"
" <method name='GetPid'>"
" <arg type='i' name='value' direction='out' />"
" </method>"
@@ -727,7 +727,7 @@ tracker_controller_dbus_start (TrackerController *controller,
priv = tracker_controller_get_instance_private (controller);
- priv->connection = tracker_sparql_connection_bus_new ("org.freedesktop.Tracker1.Miner.Files",
+ priv->connection = tracker_sparql_connection_bus_new ("org.freedesktop.Tracker3.Miner.Files",
NULL, NULL, &err);
if (!priv->connection) {
diff --git a/src/tracker-writeback/tracker-writeback.service.in
b/src/tracker-writeback/tracker-writeback.service.in
index bcb6ac1b8..cf238d2b0 100644
--- a/src/tracker-writeback/tracker-writeback.service.in
+++ b/src/tracker-writeback/tracker-writeback.service.in
@@ -3,7 +3,7 @@ Description=Tracker data writeback service
[Service]
Type=dbus
-BusName=org.freedesktop.Tracker1.Writeback
+BusName=org.freedesktop.Tracker3.Writeback
ExecStart=@libexecdir@/tracker-writeback
Restart=on-failure
# Don't restart after tracker daemon -k (aka tracker-control -k)
diff --git a/src/tracker-writeback/tracker-writeback.xml b/src/tracker-writeback/tracker-writeback.xml
index 50d1aaec1..4961087f4 100644
--- a/src/tracker-writeback/tracker-writeback.xml
+++ b/src/tracker-writeback/tracker-writeback.xml
@@ -1,16 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
-<busconfig>
- <policy context="default">
- <deny send_interface="org.freedesktop.Tracker1.Indexer"/>
- <allow send_destination="org.freedesktop.Tracker1"/>
- </policy>
-</busconfig>
--->
-
<node name="/">
- <interface name="org.freedesktop.Tracker1.Writeback">
+ <interface name="org.freedesktop.Tracker3.Writeback">
<method name="GetPid">
<annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
<arg type="i" name="value" direction="out" />
diff --git a/src/tracker/tracker-daemon.c b/src/tracker/tracker-daemon.c
index 8e0c381fb..dc0c34f31 100644
--- a/src/tracker/tracker-daemon.c
+++ b/src/tracker/tracker-daemon.c
@@ -970,7 +970,7 @@ daemon_run (void)
TrackerNotifier *notifier;
GError *error = NULL;
- sparql_connection = tracker_sparql_connection_bus_new ("org.freedesktop.Tracker1.Miner.Files",
+ sparql_connection = tracker_sparql_connection_bus_new ("org.freedesktop.Tracker3.Miner.Files",
NULL, NULL, &error);
if (!sparql_connection) {
@@ -1043,9 +1043,9 @@ daemon_run (void)
/* Display states */
g_print ("%s:\n", _("Store"));
- if (!tracker_dbus_get_connection ("org.freedesktop.Tracker1",
- "/org/freedesktop/Tracker1/Status",
- "org.freedesktop.Tracker1.Status",
+ if (!tracker_dbus_get_connection ("org.freedesktop.Tracker3",
+ "/org/freedesktop/Tracker3/Status",
+ "org.freedesktop.Tracker3.Status",
G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
&connection,
&proxy)) {
@@ -1053,10 +1053,10 @@ daemon_run (void)
}
g_dbus_connection_signal_subscribe (connection,
- "org.freedesktop.Tracker1",
- "org.freedesktop.Tracker1.Status",
+ "org.freedesktop.Tracker3",
+ "org.freedesktop.Tracker3.Status",
"Progress",
- "/org/freedesktop/Tracker1/Status",
+ "/org/freedesktop/Tracker3/Status",
NULL,
G_DBUS_SIGNAL_FLAGS_NONE,
store_progress,
diff --git a/src/tracker/tracker-index.c b/src/tracker/tracker-index.c
index ab1e864cc..1935245ef 100644
--- a/src/tracker/tracker-index.c
+++ b/src/tracker/tracker-index.c
@@ -188,7 +188,7 @@ import_turtle_files (void)
GError *error = NULL;
gchar **p;
- connection = tracker_sparql_connection_bus_new ("org.freedesktop.Tracker1.Miner.Files",
+ connection = tracker_sparql_connection_bus_new ("org.freedesktop.Tracker3.Miner.Files",
NULL, NULL, &error);
if (!connection) {
@@ -245,9 +245,9 @@ backup_index (void)
GVariant *v;
gchar *uri;
- if (!tracker_dbus_get_connection ("org.freedesktop.Tracker1",
- "/org/freedesktop/Tracker1/Backup",
- "org.freedesktop.Tracker1.Backup",
+ if (!tracker_dbus_get_connection ("org.freedesktop.Tracker3",
+ "/org/freedesktop/Tracker3/Backup",
+ "org.freedesktop.Tracker3.Backup",
G_DBUS_PROXY_FLAGS_NONE,
&connection,
&proxy)) {
@@ -302,9 +302,9 @@ restore_index (void)
GVariant *v;
gchar *uri;
- if (!tracker_dbus_get_connection ("org.freedesktop.Tracker1",
- "/org/freedesktop/Tracker1/Backup",
- "org.freedesktop.Tracker1.Backup",
+ if (!tracker_dbus_get_connection ("org.freedesktop.Tracker3",
+ "/org/freedesktop/Tracker3/Backup",
+ "org.freedesktop.Tracker3.Backup",
G_DBUS_PROXY_FLAGS_NONE,
&connection,
&proxy)) {
diff --git a/src/tracker/tracker-miner-manager.c b/src/tracker/tracker-miner-manager.c
index cd28ac3bf..3131692f5 100644
--- a/src/tracker/tracker-miner-manager.c
+++ b/src/tracker/tracker-miner-manager.c
@@ -50,7 +50,7 @@
#define METHOD_INDEX_FILE "IndexFile"
#define METHOD_INDEX_FILE_FOR_PROCESS "IndexFileForProcess"
-#define TRACKER_MINER_DBUS_INTERFACE "org.freedesktop.Tracker1.Miner"
+#define TRACKER_MINER_DBUS_INTERFACE "org.freedesktop.Tracker3.Miner"
typedef struct TrackerMinerManagerPrivate TrackerMinerManagerPrivate;
typedef struct MinerData MinerData;
@@ -693,7 +693,7 @@ tracker_miner_manager_get_running (TrackerMinerManager *manager)
return NULL;
}
- prefix = tracker_domain_ontology_get_domain (priv->domain_ontology, "Tracker1.Miner");
+ prefix = tracker_domain_ontology_get_domain (priv->domain_ontology, "Tracker3.Miner");
g_variant_get (v, "(as)", &iter);
while (g_variant_iter_loop (iter, "&s", &str)) {
@@ -766,7 +766,7 @@ check_file (GFile *file,
data->dbus_path = dbus_path;
data->name_suffix = name_suffix;
- full_name_suffix = g_strconcat ("Tracker1.", name_suffix, NULL);
+ full_name_suffix = g_strconcat ("Tracker3.", name_suffix, NULL);
data->dbus_name = tracker_domain_ontology_get_domain (priv->domain_ontology,
full_name_suffix);
g_free (full_name_suffix);
@@ -1435,7 +1435,7 @@ tracker_miner_manager_reindex_by_mimetype (TrackerMinerManager *manager,
g_return_val_if_fail (mimetypes != NULL, FALSE);
if (!tracker_miner_manager_is_active (manager,
- "org.freedesktop.Tracker1.Miner.Files")) {
+ "org.freedesktop.Tracker3.Miner.Files")) {
g_set_error_literal (error,
TRACKER_MINER_MANAGER_ERROR,
TRACKER_MINER_MANAGER_ERROR_NOT_AVAILABLE,
@@ -1446,9 +1446,9 @@ tracker_miner_manager_reindex_by_mimetype (TrackerMinerManager *manager,
priv = tracker_miner_manager_get_instance_private (manager);
v = g_dbus_connection_call_sync (priv->connection,
- "org.freedesktop.Tracker1.Miner.Files",
- "/org/freedesktop/Tracker1/Miner/Files/Index",
- "org.freedesktop.Tracker1.Miner.Files.Index",
+ "org.freedesktop.Tracker3.Miner.Files",
+ "/org/freedesktop/Tracker3/Miner/Files/Index",
+ "org.freedesktop.Tracker3.Miner.Files.Index",
"ReindexMimeTypes",
g_variant_new ("(^as)", mimetypes),
NULL,
@@ -1488,7 +1488,7 @@ miner_manager_index_file_sync (TrackerMinerManager *manager,
}
if (!tracker_miner_manager_is_active (manager,
- "org.freedesktop.Tracker1.Miner.Files")) {
+ "org.freedesktop.Tracker3.Miner.Files")) {
g_set_error_literal (error,
TRACKER_MINER_MANAGER_ERROR,
TRACKER_MINER_MANAGER_ERROR_NOT_AVAILABLE,
@@ -1501,9 +1501,9 @@ miner_manager_index_file_sync (TrackerMinerManager *manager,
uri = g_file_get_uri (file);
v = g_dbus_connection_call_sync (priv->connection,
- "org.freedesktop.Tracker1.Miner.Files",
- "/org/freedesktop/Tracker1/Miner/Files/Index",
- "org.freedesktop.Tracker1.Miner.Files.Index",
+ "org.freedesktop.Tracker3.Miner.Files",
+ "/org/freedesktop/Tracker3/Miner/Files/Index",
+ "org.freedesktop.Tracker3.Miner.Files.Index",
method_name,
g_variant_new ("(s)", uri),
NULL,
diff --git a/src/tracker/tracker-reset.c b/src/tracker/tracker-reset.c
index d5777f6d4..bccd2e600 100644
--- a/src/tracker/tracker-reset.c
+++ b/src/tracker/tracker-reset.c
@@ -72,7 +72,7 @@ delete_info_recursively (GFile *file)
gchar *query, *uri;
GError *error = NULL;
- connection = tracker_sparql_connection_bus_new ("org.freedesktop.Tracker1.Miner.Files",
+ connection = tracker_sparql_connection_bus_new ("org.freedesktop.Tracker3.Miner.Files",
NULL, NULL, &error);
if (error)
diff --git a/src/tracker/tracker-search.c b/src/tracker/tracker-search.c
index 70f858ada..fbf2b818e 100644
--- a/src/tracker/tracker-search.c
+++ b/src/tracker/tracker-search.c
@@ -1572,7 +1572,7 @@ search_run (void)
disable_snippets = TRUE;
#endif
- connection = tracker_sparql_connection_bus_new ("org.freedesktop.Tracker1.Miner.Files",
+ connection = tracker_sparql_connection_bus_new ("org.freedesktop.Tracker3.Miner.Files",
NULL, NULL, &error);
if (!connection) {
diff --git a/src/tracker/tracker-status.c b/src/tracker/tracker-status.c
index 732057096..50dc31208 100644
--- a/src/tracker/tracker-status.c
+++ b/src/tracker/tracker-status.c
@@ -79,7 +79,7 @@ status_stat (void)
TrackerSparqlCursor *cursor;
GError *error = NULL;
- connection = tracker_sparql_connection_bus_new ("org.freedesktop.Tracker1.Miner.Files",
+ connection = tracker_sparql_connection_bus_new ("org.freedesktop.Tracker3.Miner.Files",
NULL, NULL, &error);
if (!connection) {
@@ -309,7 +309,7 @@ collect_debug (void)
g_print ("[%s]\n", _("Data Statistics"));
- connection = tracker_sparql_connection_bus_new ("org.freedesktop.Tracker1.Miner.Files",
+ connection = tracker_sparql_connection_bus_new ("org.freedesktop.Tracker3.Miner.Files",
NULL, NULL, &error);
if (!connection) {
@@ -386,7 +386,7 @@ get_file_and_folder_count (int *files,
TrackerSparqlCursor *cursor;
GError *error = NULL;
- connection = tracker_sparql_connection_bus_new ("org.freedesktop.Tracker1.Miner.Files",
+ connection = tracker_sparql_connection_bus_new ("org.freedesktop.Tracker3.Miner.Files",
NULL, NULL, &error);
if (files) {
diff --git a/src/tracker/tracker-tag.c b/src/tracker/tracker-tag.c
index 0eb0c9ceb..3e31ea538 100644
--- a/src/tracker/tracker-tag.c
+++ b/src/tracker/tracker-tag.c
@@ -967,7 +967,7 @@ tag_run (void)
TrackerSparqlConnection *connection;
GError *error = NULL;
- connection = tracker_sparql_connection_bus_new ("org.freedesktop.Tracker1.Miner.Files",
+ connection = tracker_sparql_connection_bus_new ("org.freedesktop.Tracker3.Miner.Files",
NULL, NULL, &error);
if (!connection) {
diff --git a/tests/estress/abstract_engine.py b/tests/estress/abstract_engine.py
index 22fa60f62..fb35baa31 100644
--- a/tests/estress/abstract_engine.py
+++ b/tests/estress/abstract_engine.py
@@ -27,8 +27,8 @@ from abstract_text_engine import AbstractTextEngine
import time
import sys
-TRACKER = 'org.freedesktop.Tracker1'
-TRACKER_OBJ = '/org/freedesktop/Tracker1/Resources'
+TRACKER = 'org.freedesktop.Tracker3'
+TRACKER_OBJ = '/org/freedesktop/Tracker3/Resources'
#
# Abstract class that does the job.
diff --git a/tests/estress/abstract_text_engine.py b/tests/estress/abstract_text_engine.py
index 44fac9999..a5064575b 100644
--- a/tests/estress/abstract_text_engine.py
+++ b/tests/estress/abstract_text_engine.py
@@ -25,8 +25,8 @@ from dbus.mainloop.glib import DBusGMainLoop
import time
import sys
-TRACKER = 'org.freedesktop.Tracker1'
-TRACKER_OBJ = '/org/freedesktop/Tracker1/Resources'
+TRACKER = 'org.freedesktop.Tracker3'
+TRACKER_OBJ = '/org/freedesktop/Tracker3/Resources'
#
# Abstract class that does the job.
@@ -44,7 +44,7 @@ class AbstractTextEngine:
bus = dbus.SessionBus ()
self.tracker = bus.get_object (TRACKER, TRACKER_OBJ)
self.iface = dbus.Interface (self.tracker,
- "org.freedesktop.Tracker1.Resources")
+ "org.freedesktop.Tracker3.Resources")
if (timeout > 0):
self.call = 0
gobject.timeout_add (timeout * 1000,
diff --git a/tests/estress/client.py b/tests/estress/client.py
index 97b7bec87..19aabe73f 100755
--- a/tests/estress/client.py
+++ b/tests/estress/client.py
@@ -25,8 +25,8 @@ import dbus
import getopt
import sys
-TRACKER = 'org.freedesktop.Tracker1'
-TRACKER_OBJ = '/org/freedesktop/Tracker1/Resources'
+TRACKER = 'org.freedesktop.Tracker3'
+TRACKER_OBJ = '/org/freedesktop/Tracker3/Resources'
SPARQL_QUERY = """
SELECT ?entry ?title ?date ?isRead WHERE {
@@ -41,7 +41,7 @@ SPARQL_QUERY = """
bus = dbus.SessionBus ()
obj = bus.get_object (TRACKER, TRACKER_OBJ)
-iface = dbus.Interface (obj, "org.freedesktop.Tracker1.Resources")
+iface = dbus.Interface (obj, "org.freedesktop.Tracker3.Resources")
def run_query ():
start = time.time ()
diff --git a/tests/functional-tests/minerfshelper.py b/tests/functional-tests/minerfshelper.py
index 23edf2d2c..4aadd97da 100644
--- a/tests/functional-tests/minerfshelper.py
+++ b/tests/functional-tests/minerfshelper.py
@@ -39,11 +39,11 @@ class WakeupCycleTimeoutException(RuntimeError):
class MinerFsHelper ():
- MINERFS_BUSNAME = "org.freedesktop.Tracker1.Miner.Files"
- MINERFS_OBJ_PATH = "/org/freedesktop/Tracker1/Miner/Files"
- MINER_IFACE = "org.freedesktop.Tracker1.Miner"
- MINERFS_INDEX_OBJ_PATH = "/org/freedesktop/Tracker1/Miner/Files/Index"
- MINER_INDEX_IFACE = "org.freedesktop.Tracker1.Miner.Files.Index"
+ MINERFS_BUSNAME = "org.freedesktop.Tracker3.Miner.Files"
+ MINERFS_OBJ_PATH = "/org/freedesktop/Tracker3/Miner/Files"
+ MINER_IFACE = "org.freedesktop.Tracker3.Miner"
+ MINERFS_INDEX_OBJ_PATH = "/org/freedesktop/Tracker3/Miner/Files/Index"
+ MINER_INDEX_IFACE = "org.freedesktop.Tracker3.Miner.Files.Index"
def __init__(self, dbus_connection):
self.log = logging.getLogger(__name__)
@@ -68,7 +68,7 @@ class MinerFsHelper ():
def get_sparql_connection(self):
return Tracker.SparqlConnection.bus_new(
- 'org.freedesktop.Tracker1.Miner.Files', None, self.bus)
+ 'org.freedesktop.Tracker3.Miner.Files', None, self.bus)
def start_watching_progress(self):
self._previous_status = None
diff --git a/tests/libtracker-miner/miners-mock.h b/tests/libtracker-miner/miners-mock.h
index 36ffdb295..1f3fd1dc3 100644
--- a/tests/libtracker-miner/miners-mock.h
+++ b/tests/libtracker-miner/miners-mock.h
@@ -24,8 +24,8 @@
G_BEGIN_DECLS
-#define MOCK_MINER_1 "org.freedesktop.Tracker1.Miner.Mock1"
-#define MOCK_MINER_2 "org.freedesktop.Tracker1.Miner.Mock2"
+#define MOCK_MINER_1 "org.freedesktop.Tracker3.Miner.Mock1"
+#define MOCK_MINER_2 "org.freedesktop.Tracker3.Miner.Mock2"
/*
* Assumptions:
diff --git a/tests/libtracker-miner/mock-miners/mock-miner-1.desktop
b/tests/libtracker-miner/mock-miners/mock-miner-1.desktop
index 1286bb89f..9f8ba63cf 100644
--- a/tests/libtracker-miner/mock-miners/mock-miner-1.desktop
+++ b/tests/libtracker-miner/mock-miners/mock-miner-1.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
Name=Mock miner for testing
Comment=Comment in the mock miner
-DBusName=org.freedesktop.Tracker1.Miner.Mock1
-DBusPath=/org/freedesktop/Tracker1/Miner/Mock1
+DBusName=org.freedesktop.Tracker3.Miner.Mock1
+DBusPath=/org/freedesktop/Tracker3/Miner/Mock1
diff --git a/tests/libtracker-miner/mock-miners/mock-miner-2.desktop
b/tests/libtracker-miner/mock-miners/mock-miner-2.desktop
index d753b5ae0..1cf381fdb 100644
--- a/tests/libtracker-miner/mock-miners/mock-miner-2.desktop
+++ b/tests/libtracker-miner/mock-miners/mock-miner-2.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
Name=Yet another mock miner
Comment=Stupid and tedious test for the comment
-DBusName=org.freedesktop.Tracker1.Miner.Mock2
-DBusPath=/org/freedesktop/Tracker1/Miner/Mock2
+DBusName=org.freedesktop.Tracker3.Miner.Mock2
+DBusPath=/org/freedesktop/Tracker3/Miner/Mock2
diff --git a/tests/services/meson.build b/tests/services/meson.build
index fad894d4a..a2e1dcf28 100644
--- a/tests/services/meson.build
+++ b/tests/services/meson.build
@@ -3,18 +3,18 @@
# from the build tree.
tracker_extract_test_dbus_service_file = configure_file(
- input: 'org.freedesktop.Tracker1.Miner.Extract.service.in',
- output: 'org.freedesktop.Tracker1.Miner.Extract.service',
+ input: 'org.freedesktop.Tracker3.Miner.Extract.service.in',
+ output: 'org.freedesktop.Tracker3.Miner.Extract.service',
configuration: conf)
tracker_miner_fs_test_dbus_service_file = configure_file(
- input: 'org.freedesktop.Tracker1.Miner.Files.service.in',
- output: 'org.freedesktop.Tracker1.Miner.Files.service',
+ input: 'org.freedesktop.Tracker3.Miner.Files.service.in',
+ output: 'org.freedesktop.Tracker3.Miner.Files.service',
configuration: conf)
tracker_writeback_test_dbus_service_file = configure_file(
- input: 'org.freedesktop.Tracker1.Writeback.service.in',
- output: 'org.freedesktop.Tracker1.Writeback.service',
+ input: 'org.freedesktop.Tracker3.Writeback.service.in',
+ output: 'org.freedesktop.Tracker3.Writeback.service',
configuration: conf)
subdir('miners')
diff --git a/tests/services/miners/meson.build b/tests/services/miners/meson.build
index 24d340071..033c72257 100644
--- a/tests/services/miners/meson.build
+++ b/tests/services/miners/meson.build
@@ -3,13 +3,13 @@
# when running Tracker from the build tree.
tracker_extract_test_dbus_service_file = configure_file(
- input: '../org.freedesktop.Tracker1.Miner.Extract.service.in',
- output: 'org.freedesktop.Tracker1.Miner.Extract.service',
+ input: '../org.freedesktop.Tracker3.Miner.Extract.service.in',
+ output: 'org.freedesktop.Tracker3.Miner.Extract.service',
configuration: conf)
tracker_miner_fs_test_dbus_service_file = configure_file(
- input: '../org.freedesktop.Tracker1.Miner.Files.service.in',
- output: 'org.freedesktop.Tracker1.Miner.Files.service',
+ input: '../org.freedesktop.Tracker3.Miner.Files.service.in',
+ output: 'org.freedesktop.Tracker3.Miner.Files.service',
configuration: conf)
tracker_uninstalled_miner_services_dir = meson.current_build_dir()
diff --git a/tests/services/org.freedesktop.Tracker1.Miner.Extract.service.in
b/tests/services/org.freedesktop.Tracker3.Miner.Extract.service.in
similarity index 69%
rename from tests/services/org.freedesktop.Tracker1.Miner.Extract.service.in
rename to tests/services/org.freedesktop.Tracker3.Miner.Extract.service.in
index 05cd0aa76..5130f7d76 100644
--- a/tests/services/org.freedesktop.Tracker1.Miner.Extract.service.in
+++ b/tests/services/org.freedesktop.Tracker3.Miner.Extract.service.in
@@ -1,9 +1,9 @@
[D-BUS Service]
-Name=org.freedesktop.Tracker1.Miner.Extract
+Name=org.freedesktop.Tracker3.Miner.Extract
Exec=@abs_top_builddir@/src/tracker-extract/tracker-extract
SystemdService=tracker-extract.service
# Miner details needed for tracker-control
-Path=/org/freedesktop/Tracker1/Miner/Extract
+Path=/org/freedesktop/Tracker3/Miner/Extract
NameSuffix=Miner.Extract
DisplayName=Extractor
diff --git a/tests/services/org.freedesktop.Tracker1.Miner.Files.service.in
b/tests/services/org.freedesktop.Tracker3.Miner.Files.service.in
similarity index 72%
rename from tests/services/org.freedesktop.Tracker1.Miner.Files.service.in
rename to tests/services/org.freedesktop.Tracker3.Miner.Files.service.in
index 929a8003f..e0223f774 100644
--- a/tests/services/org.freedesktop.Tracker1.Miner.Files.service.in
+++ b/tests/services/org.freedesktop.Tracker3.Miner.Files.service.in
@@ -1,9 +1,9 @@
[D-BUS Service]
-Name=org.freedesktop.Tracker1.Miner.Files
+Name=org.freedesktop.Tracker3.Miner.Files
Exec=@abs_top_builddir@/src/miners/fs/tracker-miner-fs --initial-sleep=0
SystemdService=tracker-miner-fs.service
# Miner details needed for tracker-control
-Path=/org/freedesktop/Tracker1/Miner/Files
+Path=/org/freedesktop/Tracker3/Miner/Files
NameSuffix=Miner.Files
DisplayName=File System
diff --git a/tests/services/org.freedesktop.Tracker1.Writeback.service.in
b/tests/services/org.freedesktop.Tracker3.Writeback.service.in
similarity index 75%
rename from tests/services/org.freedesktop.Tracker1.Writeback.service.in
rename to tests/services/org.freedesktop.Tracker3.Writeback.service.in
index 810fd4981..1adb81298 100644
--- a/tests/services/org.freedesktop.Tracker1.Writeback.service.in
+++ b/tests/services/org.freedesktop.Tracker3.Writeback.service.in
@@ -1,4 +1,4 @@
[D-BUS Service]
-Name=org.freedesktop.Tracker1.Writeback
+Name=org.freedesktop.Tracker3.Writeback
Exec=@abs_top_builddir@/src/tracker-writeback/tracker-writeback
SystemdService=tracker-writeback.service
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
