[empathy] empathy-chat: watch for password-needed property changes
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [empathy] empathy-chat: watch for password-needed property changes
- Date: Fri, 13 Nov 2009 16:00:28 +0000 (UTC)
commit 77cd05e44a390273974fbb53266b0173a9ac7368
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Wed Nov 11 15:16:29 2009 +0000
empathy-chat: watch for password-needed property changes
This is needed when we are invited to a protected room. The channel is
created without the password requiered flag and then is updated once we
accept the invitation.
libempathy-gtk/empathy-chat.c | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c
index e64a90a..dc332c6 100644
--- a/libempathy-gtk/empathy-chat.c
+++ b/libempathy-gtk/empathy-chat.c
@@ -2458,6 +2458,17 @@ display_password_info_bar (EmpathyChat *self,
gtk_widget_show_all (info_bar);
}
+static void
+chat_password_needed_changed_cb (EmpathyChat *self)
+{
+ EmpathyChatPriv *priv = GET_PRIV (self);
+
+ if (empathy_tp_chat_password_needed (priv->tp_chat)) {
+ display_password_info_bar (self, FALSE);
+ gtk_widget_set_sensitive (priv->hpaned, FALSE);
+ }
+}
+
void
empathy_chat_set_tp_chat (EmpathyChat *chat,
EmpathyTpChat *tp_chat)
@@ -2503,6 +2514,9 @@ empathy_chat_set_tp_chat (EmpathyChat *chat,
g_signal_connect_swapped (tp_chat, "notify::remote-contact",
G_CALLBACK (chat_remote_contact_changed_cb),
chat);
+ g_signal_connect_swapped (tp_chat, "notify::password-needed",
+ G_CALLBACK (chat_password_needed_changed_cb),
+ chat);
/* Get initial value of properties */
properties = empathy_tp_chat_get_properties (priv->tp_chat);
@@ -2541,10 +2555,8 @@ empathy_chat_set_tp_chat (EmpathyChat *chat,
* been created */
show_pending_messages (chat);
- if (empathy_tp_chat_password_needed (tp_chat)) {
- display_password_info_bar (chat, FALSE);
- gtk_widget_set_sensitive (priv->hpaned, FALSE);
- }
+ /* check if a password is needed */
+ chat_password_needed_changed_cb (chat);
}
TpAccount *
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]