summaryrefslogtreecommitdiff
path: root/libempathy
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-10-24 17:11:56 +0200
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2013-10-24 17:11:56 +0200
commitafd6c51230db7c8573c7768685c26370a13259c8 (patch)
tree93954dc92a5e6779e928bf6940cbb3483a647333 /libempathy
parent72643d65cd60941b535acd09c578736b030e6c6d (diff)
downloadempathy-afd6c51230db7c8573c7768685c26370a13259c8.tar.gz
tp-chat: prepare CONTACTS before our custom feature
We rely on TP_CHANNEL_FEATURE_CONTACTS being prepared when preparing EMPATHY_TP_CHAT_FEATURE_READY.
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-tp-chat.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index f76c5b92b..6d2d0a9c9 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -967,13 +967,14 @@ static const TpProxyFeature *
tp_chat_list_features (TpProxyClass *cls G_GNUC_UNUSED)
{
static TpProxyFeature features[N_FEAT + 1] = { { 0 } };
- static GQuark need[2] = {0, 0};
+ static GQuark need[3] = {0, 0, 0};
if (G_LIKELY (features[0].name != 0))
return features;
features[FEAT_READY].name = EMPATHY_TP_CHAT_FEATURE_READY;
need[0] = TP_TEXT_CHANNEL_FEATURE_INCOMING_MESSAGES;
+ need[1] = TP_CHANNEL_FEATURE_CONTACTS;
features[FEAT_READY].depends_on = need;
features[FEAT_READY].prepare_async =
tp_chat_prepare_ready_async;