diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-07-17 19:47:03 +0800 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-07-17 19:47:03 +0800 |
commit | 36c8a8859e9c22d797be6e70164e84e9dfeb7cf6 (patch) | |
tree | 6558a2bf0b379cadac311fb8d33163fabbf9e713 | |
parent | a507ac419e482b94c2dd4d0c7ddd3cc67116b6e1 (diff) | |
download | gsoc2013-empathy-36c8a8859e9c22d797be6e70164e84e9dfeb7cf6.tar gsoc2013-empathy-36c8a8859e9c22d797be6e70164e84e9dfeb7cf6.tar.gz gsoc2013-empathy-36c8a8859e9c22d797be6e70164e84e9dfeb7cf6.tar.bz2 gsoc2013-empathy-36c8a8859e9c22d797be6e70164e84e9dfeb7cf6.tar.lz gsoc2013-empathy-36c8a8859e9c22d797be6e70164e84e9dfeb7cf6.tar.xz gsoc2013-empathy-36c8a8859e9c22d797be6e70164e84e9dfeb7cf6.tar.zst gsoc2013-empathy-36c8a8859e9c22d797be6e70164e84e9dfeb7cf6.zip |
Revert "tp-chat:requires TP_CHANNEL_FEATURE_PASSWORD"
This reverts commit 33ad5c340ed97da141c3182051502043a710e92f.
This is not the right way to fix this bug. If the channel doesn't implement
the Password iface (like in a 1-1 chat) our own tp-chat feature is never
prepared.
-rw-r--r-- | libempathy/empathy-tp-chat.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index bb465df35..03014ea01 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -940,14 +940,13 @@ static const TpProxyFeature * tp_chat_list_features (TpProxyClass *cls G_GNUC_UNUSED) { static TpProxyFeature features[N_FEAT + 1] = { { 0 } }; - static GQuark need[3] = {0, 0, 0}; + static GQuark need[2] = {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; |