[next] telepathy-haze: HazeContactList: allow can_block() to be called immediately
Simon McVittie
smcv at kemper.freedesktop.org
Wed May 7 02:18:33 PDT 2014
Module: telepathy-haze
Branch: next
Commit: 43d6d0c7a1bc07d49ac5e29afbb3f353bc77e1d9
URL: http://cgit.freedesktop.org/telepathy/telepathy-haze/commit/?id=43d6d0c7a1bc07d49ac5e29afbb3f353bc77e1d9
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: Tue Apr 22 14:25:16 2014 +0100
HazeContactList: allow can_block() to be called immediately
TpBaseContactList now calls it from constructed(), before the
HazeConnection gets its PurpleAccount.
---
src/contact-list.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/contact-list.c b/src/contact-list.c
index 12ac5fc..1b2646e 100644
--- a/src/contact-list.c
+++ b/src/contact-list.c
@@ -1309,7 +1309,8 @@ can_block (TpBaseContactList *cl)
{
HazeContactList *self = HAZE_CONTACT_LIST (cl);
- return (self->priv->conn->account->gc != NULL &&
+ return (self->priv->conn->account != NULL &&
+ self->priv->conn->account->gc != NULL &&
HAZE_CONNECTION_GET_PRPL_INFO (self->priv->conn)->add_deny != NULL);
}
More information about the telepathy-commits
mailing list