]> git.0d.be Git - empathy.git/commitdiff
Revert "tp-chat:requires TP_CHANNEL_FEATURE_PASSWORD"
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 17 Jul 2012 11:47:03 +0000 (13:47 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 17 Jul 2012 11:47:03 +0000 (13:47 +0200)
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

index bb465df3588d8659c8f799059d6ef3e3b660ecc7..03014ea01d1380db6f4c8b3d93208847d0d49aa9 100644 (file)
@@ -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;