aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-07-17 17:15:14 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-07-17 17:18:26 +0800
commit33ad5c340ed97da141c3182051502043a710e92f (patch)
tree0a8c24f82594414442b496ea9d09173e3e3240f2
parent7adae1d67fe988e53c85426bbd382da1699260c7 (diff)
downloadgsoc2013-empathy-33ad5c340ed97da141c3182051502043a710e92f.tar
gsoc2013-empathy-33ad5c340ed97da141c3182051502043a710e92f.tar.gz
gsoc2013-empathy-33ad5c340ed97da141c3182051502043a710e92f.tar.bz2
gsoc2013-empathy-33ad5c340ed97da141c3182051502043a710e92f.tar.lz
gsoc2013-empathy-33ad5c340ed97da141c3182051502043a710e92f.tar.xz
gsoc2013-empathy-33ad5c340ed97da141c3182051502043a710e92f.tar.zst
gsoc2013-empathy-33ad5c340ed97da141c3182051502043a710e92f.zip
tp-chat:requires TP_CHANNEL_FEATURE_PASSWORD
check_almost_ready() relies on the password feature to be prepared so we should make sure that tp-glib prepares it for us before starting to prepare our own feature. https://bugzilla.gnome.org/show_bug.cgi?id=680076
-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 03014ea01..bb465df35 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -940,13 +940,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_PASSWORD;
features[FEAT_READY].depends_on = need;
features[FEAT_READY].prepare_async =
tp_chat_prepare_ready_async;