tp-chat: add API to check if a password is required

diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 79136156a68e3d49c4fe4ca10435cb59c1c4ad0f..73c446a7dc91ad92e8d920fa2fd833b596fee3f8 100644 (file)
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -55,6 +55,10 @@ typedef struct {
        GQueue                *pending_messages_queue;
        gboolean               had_properties_list;
        GPtrArray             *properties;
+       TpChannelPasswordFlags password_flags;
+       /* TRUE if we fetched the password flag of the channel or if it's not needed
+        * (channel doesn't implement the Password interface) */
+       gboolean               got_password_flags;
        gboolean               ready;
 } EmpathyTpChatPriv;
 
@@ -1035,6 +1039,20 @@ tp_chat_got_self_contact_cb (EmpathyTpContactFactory *factory,
        tp_chat_check_if_ready (EMPATHY_TP_CHAT (chat));
 }
 
+static void
+got_password_flags_cb (TpChannel *proxy,
+                            guint password_flags,
+                            const GError *error,
+                            gpointer user_data,
+                            GObject *weak_object)
+{
+       EmpathyTpChat *self = EMPATHY_TP_CHAT (weak_object);
+       EmpathyTpChatPriv *priv = GET_PRIV (self);
+
+       priv->got_password_flags = TRUE;
+       priv->password_flags = password_flags;
+}
+
 static GObject *
 tp_chat_constructor (GType                  type,
                     guint                  n_props,
@@ -1105,6 +1123,17 @@ tp_chat_constructor (GType                  type,
                                                                               G_OBJECT (chat), NULL);
        }
 
+       /* Check if the chat is password protected */
+       if (tp_proxy_has_interface_by_id (priv->channel,
+                                         TP_IFACE_QUARK_CHANNEL_INTERFACE_PASSWORD)) {
+               priv->got_password_flags = FALSE;
+               tp_cli_channel_interface_password_call_get_password_flags (priv->channel,
+                                                                              -1, got_password_flags_cb, chat, NULL, chat);
+       } else {
+               /* No Password interface, so no need to fetch the password flags */
+               priv->got_password_flags = TRUE;
+       }
+
        return chat;
 }
 
@@ -1477,3 +1506,10 @@ empathy_tp_chat_acknowledge_messages (EmpathyTpChat *chat,
        g_list_free (msgs);
 }
 
+gboolean
+empathy_tp_chat_password_needed (EmpathyTpChat *self)
+{
+       EmpathyTpChatPriv *priv = GET_PRIV (self);
+
+       return priv->password_flags & TP_CHANNEL_PASSWORD_FLAG_PROVIDE;
+}

diff --git a/libempathy/empathy-tp-chat.h b/libempathy/empathy-tp-chat.h
index f07f0648f3ce0fdb9851c8ce10e37e6995934bd8..4dec0cd28cbb94d06b50b14167a6be44f1447c66 100644 (file)
--- a/libempathy/empathy-tp-chat.h
+++ b/libempathy/empathy-tp-chat.h
@@ -86,6 +86,8 @@ void           empathy_tp_chat_acknowledge_message (EmpathyTpChat *chat,
 void           empathy_tp_chat_acknowledge_messages (EmpathyTpChat *chat,
                                                     const GList *messages);
 
+gboolean       empathy_tp_chat_password_needed (EmpathyTpChat *chat);
+
 G_END_DECLS
 
 #endif /* __EMPATHY_TP_CHAT_H__ */