tp-chat: prepare CONTACTS before our custom feature

We rely on TP_CHANNEL_FEATURE_CONTACTS being prepared when preparing
EMPATHY_TP_CHAT_FEATURE_READY.

diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index f76c5b92b9d61f80f0dcfedf4dadf32e6586ec8b..6d2d0a9c9e6e5023029aab8b58cdf1cc89f05170 100644 (file)
--- 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 } };
 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;
 
   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;
   features[FEAT_READY].depends_on = need;
   features[FEAT_READY].prepare_async =
     tp_chat_prepare_ready_async;