[gnome-photos/sam/tracker3: 15/27] Update for tracker3 API breaks
- From: Sam Thursfield <sthursfield src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-photos/sam/tracker3: 15/27] Update for tracker3 API breaks
- Date: Thu, 13 Aug 2020 00:11:03 +0000 (UTC)
commit ed66e09d27979a3cfba06fa16a13840b8e5f37ea
Author: Sam Thursfield <sam afuera me uk>
Date: Fri Jul 10 02:23:32 2020 +0200
Update for tracker3 API breaks
src/meson.build | 4 ++--
src/photos-application.c | 4 ++--
src/photos-indexing-notification.c | 2 +-
src/photos-source.c | 2 +-
src/photos-tracker-change-monitor.c | 4 ++--
src/photos-tracker-extract-priority.xml | 2 +-
src/photos-tracker-queue.c | 2 --
src/photos-tracker-resources.xml | 2 +-
8 files changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/src/meson.build b/src/meson.build
index 6306fcdc..bc134b8d 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -372,7 +372,7 @@ tracker_extract_priority = 'photos-tracker-extract-priority'
sources += gnome.gdbus_codegen(
tracker_extract_priority,
tracker_extract_priority + '.xml',
- interface_prefix: 'org.freedesktop.Tracker1.',
+ interface_prefix: 'org.freedesktop.Tracker3.',
namespace: 'Tracker',
autocleanup: 'all',
)
@@ -382,7 +382,7 @@ tracker_resources = 'photos-tracker-resources'
sources += gnome.gdbus_codegen(
tracker_resources,
tracker_resources + '.xml',
- interface_prefix: 'org.freedesktop.Tracker1.',
+ interface_prefix: 'org.freedesktop.Tracker3.',
namespace: 'Tracker',
autocleanup: 'all',
)
diff --git a/src/photos-application.c b/src/photos-application.c
index 9d6b900c..03448fbb 100644
--- a/src/photos-application.c
+++ b/src/photos-application.c
@@ -829,8 +829,8 @@ photos_application_create_window (PhotosApplication *self)
g_application_hold (G_APPLICATION (self));
tracker_extract_priority_proxy_new_for_bus (G_BUS_TYPE_SESSION,
G_DBUS_PROXY_FLAGS_NONE,
- "org.freedesktop.Tracker1.Miner.Extract",
- "/org/freedesktop/Tracker1/Extract/Priority",
+ "org.freedesktop.Tracker3.Miner.Extract",
+ "/org/freedesktop/Tracker3/Extract/Priority",
self->create_window_cancellable,
photos_application_tracker_extract_priority,
self);
diff --git a/src/photos-indexing-notification.c b/src/photos-indexing-notification.c
index 566a1d98..13be761f 100644
--- a/src/photos-indexing-notification.c
+++ b/src/photos-indexing-notification.c
@@ -54,7 +54,7 @@ enum
REMOTE_MINER_TIMEOUT = 10 /* s */
};
-static const gchar *MINER_FILES = "org.freedesktop.Tracker1.Miner.Files";
+static const gchar *MINER_FILES = "org.freedesktop.Tracker3.Miner.Files";
static void
diff --git a/src/photos-source.c b/src/photos-source.c
index 4e2bc483..097e8f55 100644
--- a/src/photos-source.c
+++ b/src/photos-source.c
@@ -62,7 +62,7 @@ G_DEFINE_TYPE_WITH_CODE (PhotosSource, photos_source, G_TYPE_OBJECT,
DZL_DEFINE_COUNTER (instances, "PhotosSource", "Instances", "Number of PhotosSource instances")
-static const gchar *TRACKER_SCHEMA = "org.freedesktop.Tracker.Miner.Files";
+static const gchar *TRACKER_SCHEMA = "org.freedesktop.Tracker3.Miner.Files";
static const gchar *TRACKER_KEY_RECURSIVE_DIRECTORIES = "index-recursive-directories";
diff --git a/src/photos-tracker-change-monitor.c b/src/photos-tracker-change-monitor.c
index 2e9810aa..8a738e9c 100644
--- a/src/photos-tracker-change-monitor.c
+++ b/src/photos-tracker-change-monitor.c
@@ -434,8 +434,8 @@ photos_tracker_change_monitor_initable_init (GInitable *initable, GCancellable *
self->resource_service = tracker_resources_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION,
G_DBUS_PROXY_FLAGS_NONE,
- "org.freedesktop.Tracker1",
- "/org/freedesktop/Tracker1/Resources",
+ "org.freedesktop.Tracker3",
+ "/org/freedesktop/Tracker3/Resources",
cancellable,
error);
if (G_UNLIKELY (self->resource_service == NULL))
diff --git a/src/photos-tracker-extract-priority.xml b/src/photos-tracker-extract-priority.xml
index 7e3b9b0c..2b562299 100644
--- a/src/photos-tracker-extract-priority.xml
+++ b/src/photos-tracker-extract-priority.xml
@@ -21,7 +21,7 @@
-->
<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
- <interface name="org.freedesktop.Tracker1.Extract.Priority">
+ <interface name="org.freedesktop.Tracker3.Extract.Priority">
<method name="ClearRdfTypes" />
<method name="SetRdfTypes">
<arg name="rdf_types" type="as" direction="in" />
diff --git a/src/photos-tracker-queue.c b/src/photos-tracker-queue.c
index ecba0dae..99abf29f 100644
--- a/src/photos-tracker-queue.c
+++ b/src/photos-tracker-queue.c
@@ -189,7 +189,6 @@ photos_tracker_queue_check (PhotosTrackerQueue *self)
case PHOTOS_TRACKER_QUERY_UPDATE:
tracker_sparql_connection_update_async (self->connection,
sparql,
- G_PRIORITY_DEFAULT,
data->cancellable,
photos_tracker_queue_collector,
g_object_ref (self));
@@ -198,7 +197,6 @@ photos_tracker_queue_check (PhotosTrackerQueue *self)
case PHOTOS_TRACKER_QUERY_UPDATE_BLANK:
tracker_sparql_connection_update_blank_async (self->connection,
sparql,
- G_PRIORITY_DEFAULT,
data->cancellable,
photos_tracker_queue_collector,
g_object_ref (self));
diff --git a/src/photos-tracker-resources.xml b/src/photos-tracker-resources.xml
index 18177aa0..df2fe832 100644
--- a/src/photos-tracker-resources.xml
+++ b/src/photos-tracker-resources.xml
@@ -21,7 +21,7 @@
-->
<node name="/" xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
- <interface name="org.freedesktop.Tracker1.Resources">
+ <interface name="org.freedesktop.Tracker3.Resources">
<signal name="GraphUpdated">
<arg name="className" type="s" />
<arg name="deleteEvents" type="a(iiii)" />
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]