[tracker] Override Sparql.Connection.update_array_async() with correct return-type



commit 6446a48ac7d7a7cb524d0bb2f171cb2e11a206ad
Author: Matthias Berndt <matthias_berndt gmx de>
Date:   Tue Oct 4 11:08:39 2016 +0200

    Override Sparql.Connection.update_array_async() with correct return-type
    
    "Error" is an unqualified identifier and can thus refer to different types
    in different contexts. In the context of tracker-connection.vala it refers
    to Tracker.Sparql.Error, in the context of tracker-bus.vala it refers to
    GLib.Error.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=772381

 src/libtracker-bus/tracker-bus.vala                |    4 ++--
 src/libtracker-sparql-backend/tracker-backend.vala |    2 +-
 src/libtracker-sparql/tracker-connection.vala      |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/libtracker-bus/tracker-bus.vala b/src/libtracker-bus/tracker-bus.vala
index 3b4b380..527a9e1 100644
--- a/src/libtracker-bus/tracker-bus.vala
+++ b/src/libtracker-bus/tracker-bus.vala
@@ -168,7 +168,7 @@ public class Tracker.Bus.Connection : Tracker.Sparql.Connection {
                handle_error_reply (reply);
        }
 
-       public async override GenericArray<Error?>? update_array_async (string[] sparql, int priority = 
GLib.Priority.DEFAULT, Cancellable? cancellable = null) throws Sparql.Error, GLib.Error, GLib.IOError, 
DBusError {
+       public async override GenericArray<Sparql.Error?>? update_array_async (string[] sparql, int priority 
= GLib.Priority.DEFAULT, Cancellable? cancellable = null) throws Sparql.Error, GLib.Error, GLib.IOError, 
DBusError {
                UnixInputStream input;
                UnixOutputStream output;
                pipe (out input, out output);
@@ -203,7 +203,7 @@ public class Tracker.Bus.Connection : Tracker.Sparql.Connection {
                handle_error_reply (reply);
 
                // process results (errors)
-               var result = new GenericArray<Error?> ();
+               var result = new GenericArray<Sparql.Error?> ();
                Variant resultv;
                resultv = reply.get_body ().get_child_value (0);
                var iter = resultv.iterator ();
diff --git a/src/libtracker-sparql-backend/tracker-backend.vala 
b/src/libtracker-sparql-backend/tracker-backend.vala
index 5c2f4a5..80160aa 100644
--- a/src/libtracker-sparql-backend/tracker-backend.vala
+++ b/src/libtracker-sparql-backend/tracker-backend.vala
@@ -133,7 +133,7 @@ class Tracker.Sparql.Backend : Connection {
                yield bus.update_async (sparql, priority, cancellable);
        }
 
-       public async override GenericArray<Error?>? update_array_async (string[] sparql, int priority = 
GLib.Priority.DEFAULT, Cancellable? cancellable = null) throws Sparql.Error, IOError, DBusError {
+       public async override GenericArray<Sparql.Error?>? update_array_async (string[] sparql, int priority 
= GLib.Priority.DEFAULT, Cancellable? cancellable = null) throws Sparql.Error, IOError, DBusError {
                if (bus == null) {
                        throw new Sparql.Error.UNSUPPORTED ("Update support not available for direct-only 
connection");
                }
diff --git a/src/libtracker-sparql/tracker-connection.vala b/src/libtracker-sparql/tracker-connection.vala
index 1e1749e..1c6b976 100644
--- a/src/libtracker-sparql/tracker-connection.vala
+++ b/src/libtracker-sparql/tracker-connection.vala
@@ -373,7 +373,7 @@ public abstract class Tracker.Sparql.Connection : Object {
         *
         * Since: 0.10
         */
-       public async virtual GenericArray<Error?>? update_array_async (string[] sparql, int priority = 
GLib.Priority.DEFAULT, Cancellable? cancellable = null) throws Sparql.Error, GLib.Error, GLib.IOError, 
DBusError {
+       public async virtual GenericArray<Sparql.Error?>? update_array_async (string[] sparql, int priority = 
GLib.Priority.DEFAULT, Cancellable? cancellable = null) throws Sparql.Error, GLib.Error, GLib.IOError, 
DBusError {
                warning ("Interface 'update_array_async' not implemented");
                return null;
        }


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