summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2020-02-24 01:17:07 +0100
committerCarlos Garnacho <carlosg@gnome.org>2020-04-05 14:37:41 +0200
commit9fb9ffedc03db870cf3680f9ec549916a9140eac (patch)
tree5c47371c3d1238c4a2a00988cc6c9e4bc93850df
parente95abfedceb7f7ac063018a9bcd37b8f15be4d08 (diff)
downloadtracker-9fb9ffedc03db870cf3680f9ec549916a9140eac.tar.gz
libtracker-sparql: Update endpoint interface/path to Tracker3
Use a tracker version consistent with our current API version.
-rw-r--r--src/libtracker-bus/tracker-bus-statement.vala2
-rw-r--r--src/libtracker-bus/tracker-bus.vala2
-rw-r--r--src/libtracker-sparql-backend/tracker-backend.vala2
-rw-r--r--src/libtracker-sparql/tracker-endpoint-dbus.c8
-rw-r--r--src/libtracker-sparql/tracker-notifier.c4
5 files changed, 8 insertions, 10 deletions
diff --git a/src/libtracker-bus/tracker-bus-statement.vala b/src/libtracker-bus/tracker-bus-statement.vala
index e5d78b933..b14143901 100644
--- a/src/libtracker-bus/tracker-bus-statement.vala
+++ b/src/libtracker-bus/tracker-bus-statement.vala
@@ -26,8 +26,6 @@ public class Tracker.Bus.Statement : Tracker.Sparql.Statement {
private string object_path;
private HashTable<string,GLib.Variant> arguments;
- private const string ENDPOINT_IFACE = "org.freedesktop.Tracker1.Endpoint";
-
public Statement (DBusConnection bus, string dbus_name, string object_path, string query) {
Object ();
this.bus = bus;
diff --git a/src/libtracker-bus/tracker-bus.vala b/src/libtracker-bus/tracker-bus.vala
index 1a0d01db4..af3e4b2e3 100644
--- a/src/libtracker-bus/tracker-bus.vala
+++ b/src/libtracker-bus/tracker-bus.vala
@@ -22,7 +22,7 @@ public class Tracker.Bus.Connection : Tracker.Sparql.Connection {
string dbus_name;
string object_path;
- private const string ENDPOINT_IFACE = "org.freedesktop.Tracker1.Endpoint";
+ private const string ENDPOINT_IFACE = "org.freedesktop.Tracker3.Endpoint";
public Connection (string dbus_name, string object_path, DBusConnection? dbus_connection) throws Sparql.Error, IOError, DBusError, GLib.Error {
Object ();
diff --git a/src/libtracker-sparql-backend/tracker-backend.vala b/src/libtracker-sparql-backend/tracker-backend.vala
index 79db936a1..97de8a394 100644
--- a/src/libtracker-sparql-backend/tracker-backend.vala
+++ b/src/libtracker-sparql-backend/tracker-backend.vala
@@ -33,7 +33,7 @@ public static Tracker.Sparql.Connection tracker_sparql_connection_bus_new (strin
if (object_path != null)
path = object_path;
else
- path = "/org/freedesktop/Tracker1/Endpoint";
+ path = "/org/freedesktop/Tracker3/Endpoint";
return new Tracker.Bus.Connection (service, path, dbus_conn);
}
diff --git a/src/libtracker-sparql/tracker-endpoint-dbus.c b/src/libtracker-sparql/tracker-endpoint-dbus.c
index 6e977e746..3630579e6 100644
--- a/src/libtracker-sparql/tracker-endpoint-dbus.c
+++ b/src/libtracker-sparql/tracker-endpoint-dbus.c
@@ -32,7 +32,7 @@
static const gchar introspection_xml[] =
"<node>"
- " <interface name='org.freedesktop.Tracker1.Endpoint'>"
+ " <interface name='org.freedesktop.Tracker3.Endpoint'>"
" <method name='Query'>"
" <arg type='s' name='query' direction='in' />"
" <arg type='h' name='output_stream' direction='in' />"
@@ -597,7 +597,7 @@ notifier_events_cb (TrackerNotifier *notifier,
if (!g_dbus_connection_emit_signal (endpoint_dbus->dbus_connection,
NULL,
endpoint_dbus->object_path,
- "org.freedesktop.Tracker1.Endpoint",
+ "org.freedesktop.Tracker3.Endpoint",
"GraphUpdated",
g_variant_builder_end (&builder),
&error)) {
@@ -751,7 +751,7 @@ tracker_endpoint_dbus_init (TrackerEndpointDBus *endpoint)
* @error: pointer to a #GError
*
* Registers a Tracker endpoint object at @object_path on @dbus_connection.
- * The default object path is "/org/freedesktop/Tracker1/Endpoint".
+ * The default object path is "/org/freedesktop/Tracker3/Endpoint".
*
* Returns: (transfer full): a #TrackerEndpointDBus object.
*/
@@ -768,7 +768,7 @@ tracker_endpoint_dbus_new (TrackerSparqlConnection *sparql_connection,
g_return_val_if_fail (!error || !*error, NULL);
if (!object_path)
- object_path = "/org/freedesktop/Tracker1/Endpoint";
+ object_path = "/org/freedesktop/Tracker3/Endpoint";
return g_initable_new (TRACKER_TYPE_ENDPOINT_DBUS, cancellable, error,
"dbus-connection", dbus_connection,
diff --git a/src/libtracker-sparql/tracker-notifier.c b/src/libtracker-sparql/tracker-notifier.c
index 3859fb667..14d6909b4 100644
--- a/src/libtracker-sparql/tracker-notifier.c
+++ b/src/libtracker-sparql/tracker-notifier.c
@@ -633,9 +633,9 @@ tracker_notifier_signal_subscribe (TrackerNotifier *notifier,
handler_id =
g_dbus_connection_signal_subscribe (connection,
service,
- "org.freedesktop.Tracker1.Endpoint",
+ "org.freedesktop.Tracker3.Endpoint",
"GraphUpdated",
- "/org/freedesktop/Tracker1/Endpoint",
+ "/org/freedesktop/Tracker3/Endpoint",
graph,
G_DBUS_SIGNAL_FLAGS_NONE,
graph_updated_cb,