[folks] TpfPersonaStore: warn on error initialising tp logger
- From: Xavier Claessens <xclaesse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [folks] TpfPersonaStore: warn on error initialising tp logger
- Date: Fri, 13 Apr 2012 14:40:41 +0000 (UTC)
commit 9d525bb0c3ae87b2156dfa52ee37736d42a6dd71
Author: Xavier Claessens <xavier claessens collabora co uk>
Date: Tue Apr 10 16:54:21 2012 +0200
TpfPersonaStore: warn on error initialising tp logger
https://bugzilla.gnome.org/show_bug.cgi?id=630822
backends/telepathy/lib/tpf-persona-store.vala | 53 ++++++++++--------------
1 files changed, 22 insertions(+), 31 deletions(-)
---
diff --git a/backends/telepathy/lib/tpf-persona-store.vala b/backends/telepathy/lib/tpf-persona-store.vala
index 8ae4711..ce1c6e0 100644
--- a/backends/telepathy/lib/tpf-persona-store.vala
+++ b/backends/telepathy/lib/tpf-persona-store.vala
@@ -462,25 +462,23 @@ public class Tpf.PersonaStore : Folks.PersonaStore
}
});
- /* We have to connect to the logger before dealing with the
- * account status, because if the account's already connected we
- * want to be able to query favourite information immediately. */
- try
- {
- this._logger = new Logger (this.id);
- yield this._logger.prepare ();
- this._logger.invalidated.connect (
- this._logger_invalidated_cb);
- this._logger.favourite_contacts_changed.connect (
- this._favourite_contacts_changed_cb);
- this._initialise_favourite_contacts.begin ();
- }
- catch (GLib.Error e)
- {
- warning (
- _("Couldn't connect to the telepathy-logger service."));
- this._logger = null;
- }
+ this._logger = new Logger (this.id);
+ this._logger.invalidated.connect (
+ this._logger_invalidated_cb);
+ this._logger.favourite_contacts_changed.connect (
+ this._favourite_contacts_changed_cb);
+ this._initialise_favourite_contacts.begin ((o, r) =>
+ {
+ try
+ {
+ this._initialise_favourite_contacts.end (r);
+ }
+ catch (GLib.Error e)
+ {
+ warning ("Failed to initialise favourite contacts: %s",
+ e.message);
+ }
+ });
this.account.notify["connection"].connect (
this._notify_connection_cb);
@@ -532,22 +530,15 @@ public class Tpf.PersonaStore : Folks.PersonaStore
this._logger = null;
}
- private async void _initialise_favourite_contacts ()
+ private async void _initialise_favourite_contacts () throws GLib.Error
{
if (this._logger == null)
return;
- /* Get an initial set of favourite contacts */
- try
- {
- var contacts = yield this._logger.get_favourite_contacts ();
- this._favourite_contacts_changed_cb (contacts, {});
- }
- catch (GLib.Error e)
- {
- /* Translators: the parameter is an error message. */
- warning (_("Couldn't get list of favorite contacts: %s"), e.message);
- }
+ yield this._logger.prepare ();
+
+ var contacts = yield this._logger.get_favourite_contacts ();
+ this._favourite_contacts_changed_cb (contacts, {});
}
private Persona? _lookup_persona_by_id (string id)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]