diff options
author | Martyn Russell <martyn@lanedo.com> | 2014-09-04 10:26:20 +0100 |
---|---|---|
committer | Martyn Russell <martyn@lanedo.com> | 2014-09-04 10:26:20 +0100 |
commit | 02bdcedf519a1fb50d56263113bf548ad8d71934 (patch) | |
tree | f392a744ff551f2ecd66815b8910314f4945963b /src/libtracker-bus | |
parent | dbc9d3076a2a2bfab092a84a169bb9d89a842773 (diff) | |
download | tracker-02bdcedf519a1fb50d56263113bf548ad8d71934.tar.gz |
libtracker-sparql: ALL APIs can now throw GLib.Error
This fixes a warning about not catching a potential GLib.Error being thrown
for the GUnixFDList's _append() API.
Diffstat (limited to 'src/libtracker-bus')
-rw-r--r-- | src/libtracker-bus/tracker-bus.vala | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/libtracker-bus/tracker-bus.vala b/src/libtracker-bus/tracker-bus.vala index 2f1bf1449..9e6f0dd47 100644 --- a/src/libtracker-bus/tracker-bus.vala +++ b/src/libtracker-bus/tracker-bus.vala @@ -50,7 +50,7 @@ public class Tracker.Bus.Connection : Tracker.Sparql.Connection { } } - void send_query (string sparql, UnixOutputStream output, Cancellable? cancellable, AsyncReadyCallback? callback) throws GLib.IOError { + void send_query (string sparql, UnixOutputStream output, Cancellable? cancellable, AsyncReadyCallback? callback) throws GLib.IOError, GLib.Error { var message = new DBusMessage.method_call (Tracker.DBUS_SERVICE, Tracker.DBUS_OBJECT_STEROIDS, Tracker.DBUS_INTERFACE_STEROIDS, "Query"); var fd_list = new UnixFDList (); message.set_body (new Variant ("(sh)", sparql, fd_list.append (output.fd))); @@ -59,7 +59,7 @@ public class Tracker.Bus.Connection : Tracker.Sparql.Connection { bus.send_message_with_reply.begin (message, DBusSendMessageFlags.NONE, int.MAX, null, cancellable, callback); } - public override Sparql.Cursor query (string sparql, Cancellable? cancellable) throws Sparql.Error, IOError, DBusError { + public override Sparql.Cursor query (string sparql, Cancellable? cancellable) throws Sparql.Error, GLib.Error, GLib.IOError, DBusError { // use separate main context for sync operation var context = new MainContext (); var loop = new MainLoop (context, false); @@ -74,7 +74,7 @@ public class Tracker.Bus.Connection : Tracker.Sparql.Connection { return query_async.end (async_res); } - public async override Sparql.Cursor query_async (string sparql, Cancellable? cancellable = null) throws Sparql.Error, IOError, DBusError { + public async override Sparql.Cursor query_async (string sparql, Cancellable? cancellable = null) throws Sparql.Error, GLib.Error, GLib.IOError, DBusError { UnixInputStream input; UnixOutputStream output; pipe (out input, out output); @@ -109,7 +109,7 @@ public class Tracker.Bus.Connection : Tracker.Sparql.Connection { return new FDCursor (mem_stream.steal_data (), mem_stream.data_size, variable_names); } - void send_update (string method, UnixInputStream input, Cancellable? cancellable, AsyncReadyCallback? callback) throws GLib.IOError { + void send_update (string method, UnixInputStream input, Cancellable? cancellable, AsyncReadyCallback? callback) throws GLib.Error, GLib.IOError { var message = new DBusMessage.method_call (Tracker.DBUS_SERVICE, Tracker.DBUS_OBJECT_STEROIDS, Tracker.DBUS_INTERFACE_STEROIDS, method); var fd_list = new UnixFDList (); message.set_body (new Variant ("(h)", fd_list.append (input.fd))); @@ -118,7 +118,7 @@ public class Tracker.Bus.Connection : Tracker.Sparql.Connection { bus.send_message_with_reply.begin (message, DBusSendMessageFlags.NONE, int.MAX, null, cancellable, callback); } - public override void update (string sparql, int priority = GLib.Priority.DEFAULT, Cancellable? cancellable = null) throws Sparql.Error, IOError, DBusError { + public override void update (string sparql, int priority = GLib.Priority.DEFAULT, Cancellable? cancellable = null) throws Sparql.Error, GLib.Error, GLib.IOError, DBusError { // use separate main context for sync operation var context = new MainContext (); var loop = new MainLoop (context, false); @@ -133,7 +133,7 @@ public class Tracker.Bus.Connection : Tracker.Sparql.Connection { update_async.end (async_res); } - public async override void update_async (string sparql, int priority = GLib.Priority.DEFAULT, Cancellable? cancellable = null) throws Sparql.Error, IOError, DBusError { + public async override void update_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); @@ -165,7 +165,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, IOError, DBusError { + 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 { UnixInputStream input; UnixOutputStream output; pipe (out input, out output); @@ -221,7 +221,7 @@ public class Tracker.Bus.Connection : Tracker.Sparql.Connection { return result; } - public override GLib.Variant? update_blank (string sparql, int priority = GLib.Priority.DEFAULT, Cancellable? cancellable = null) throws Sparql.Error, IOError, DBusError { + public override GLib.Variant? update_blank (string sparql, int priority = GLib.Priority.DEFAULT, Cancellable? cancellable = null) throws Sparql.Error, GLib.Error, GLib.IOError, DBusError { // use separate main context for sync operation var context = new MainContext (); var loop = new MainLoop (context, false); @@ -236,7 +236,7 @@ public class Tracker.Bus.Connection : Tracker.Sparql.Connection { return update_blank_async.end (async_res); } - public async override GLib.Variant? update_blank_async (string sparql, int priority = GLib.Priority.DEFAULT, Cancellable? cancellable = null) throws Sparql.Error, IOError, DBusError { + public async override GLib.Variant? update_blank_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); |