Commit fa396c2c authored by Travis Reitter's avatar Travis Reitter

Use the GLib definition of Error instead of DBus.Error.

Helps: bgo#629716 - Migrate Folks to GDBus
parent 0f45b115
......@@ -33,11 +33,11 @@ private struct AccountFavourites
private interface LoggerIface : Object
{
public abstract async AccountFavourites[] get_favourite_contacts ()
throws DBus.Error;
throws GLib.Error;
public abstract async void add_favourite_contact (
ObjectPath account_path, string id) throws DBus.Error;
ObjectPath account_path, string id) throws GLib.Error;
public abstract async void remove_favourite_contact (
ObjectPath account_path, string id) throws DBus.Error;
ObjectPath account_path, string id) throws GLib.Error;
public abstract signal void favourite_contacts_changed (
ObjectPath account_path, string[] added, string[] removed);
......@@ -52,7 +52,7 @@ internal class Logger : GLib.Object
public signal void favourite_contacts_changed (string[] added,
string[] removed);
public Logger (string account_path) throws DBus.Error
public Logger (string account_path) throws TelepathyGLib.DBusError
{
if (this._logger == null)
{
......@@ -100,7 +100,7 @@ internal class Logger : GLib.Object
});
}
public async string[] get_favourite_contacts () throws DBus.Error
public async string[] get_favourite_contacts () throws GLib.Error
{
/* Invalidated */
if (this._logger == null)
......@@ -118,7 +118,7 @@ internal class Logger : GLib.Object
return {};
}
public async void add_favourite_contact (string id) throws DBus.Error
public async void add_favourite_contact (string id) throws GLib.Error
{
/* Invalidated */
if (this._logger == null)
......@@ -128,7 +128,7 @@ internal class Logger : GLib.Object
new ObjectPath (this._account_path), id);
}
public async void remove_favourite_contact (string id) throws DBus.Error
public async void remove_favourite_contact (string id) throws GLib.Error
{
/* Invalidated */
if (this._logger == null)
......
......@@ -543,7 +543,7 @@ public class Tpf.PersonaStore : Folks.PersonaStore
this._logger.favourite_contacts_changed.connect (
this._favourite_contacts_changed_cb);
}
catch (DBus.Error e)
catch (GLib.Error e)
{
warning (
_("Couldn't connect to the telepathy-logger service."));
......@@ -593,7 +593,7 @@ public class Tpf.PersonaStore : Folks.PersonaStore
* seems to swap the order of user_data and weak_object in the
* callback. */
}
catch (DBus.Error e)
catch (GLib.Error e)
{
/* Translators: the parameter is an error message. */
warning (_("Couldn't get list of favorite contacts: %s"), e.message);
......@@ -1863,7 +1863,7 @@ public class Tpf.PersonaStore : Folks.PersonaStore
else
yield this._logger.remove_favourite_contact (id);
}
catch (DBus.Error e)
catch (GLib.Error e)
{
warning (_("Failed to change a persona's favorite status."));
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment