From 36c8a8859e9c22d797be6e70164e84e9dfeb7cf6 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Tue, 17 Jul 2012 13:47:03 +0200 Subject: 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. --- libempathy/empathy-tp-chat.c | 3 +-- 1 file changed, 1 insertion(+), 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; -- cgit v1.2.3