Commit e2e49f92 authored by Philip Withnall's avatar Philip Withnall Committed by Travis Reitter
Browse files

Ensure we prepare all TpAccounts before trying to use them.

Helps: bgo#659041 - tpf-persona-store.vala: try to connect to a NULL object
parent 506baeb1
......@@ -533,7 +533,7 @@ public class Tpf.PersonaStore : Folks.PersonaStore
*
* See {@link Folks.PersonaStore.prepare}.
*/
public override async void prepare ()
public override async void prepare () throws GLib.Error
{
lock (this._is_prepared)
{
......@@ -580,6 +580,9 @@ public class Tpf.PersonaStore : Folks.PersonaStore
this._logger = null;
}
/* Ensure the account's prepared first. */
yield this.account.prepare_async (null);
this.account.status_changed.connect (
this._account_status_changed_cb);
......
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