aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-09-27 18:39:44 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-10-03 18:04:15 +0800
commit22eab320c9669b7c6307bf202ca661e12ff8de57 (patch)
treea23cbda7f2f5232170e3d1443216e8e78944f7f7
parent11e0514f64c70770393f22b410c9e23153c132b3 (diff)
downloadgsoc2013-empathy-22eab320c9669b7c6307bf202ca661e12ff8de57.tar
gsoc2013-empathy-22eab320c9669b7c6307bf202ca661e12ff8de57.tar.gz
gsoc2013-empathy-22eab320c9669b7c6307bf202ca661e12ff8de57.tar.bz2
gsoc2013-empathy-22eab320c9669b7c6307bf202ca661e12ff8de57.tar.lz
gsoc2013-empathy-22eab320c9669b7c6307bf202ca661e12ff8de57.tar.xz
gsoc2013-empathy-22eab320c9669b7c6307bf202ca661e12ff8de57.tar.zst
gsoc2013-empathy-22eab320c9669b7c6307bf202ca661e12ff8de57.zip
chat-window: update the contact menu when folks is loaded
-rw-r--r--src/empathy-chat-window.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/empathy-chat-window.c b/src/empathy-chat-window.c
index 9dfe225b0..296fc6775 100644
--- a/src/empathy-chat-window.c
+++ b/src/empathy-chat-window.c
@@ -1914,6 +1914,13 @@ chat_window_focus_in_event_cb (GtkWidget *widget,
return FALSE;
}
+static void
+contacts_loaded_cb (EmpathyIndividualManager *mgr,
+ EmpathyChatWindow *self)
+{
+ chat_window_contact_menu_update (self);
+}
+
static gboolean
chat_window_focus_out_event_cb (GtkWidget *widget,
GdkEvent *event,
@@ -1939,6 +1946,15 @@ chat_window_focus_out_event_cb (GtkWidget *widget,
*/
self->priv->individual_mgr = empathy_individual_manager_dup_singleton ();
+ if (!empathy_individual_manager_get_contacts_loaded (
+ self->priv->individual_mgr))
+ {
+ /* We want to update the contact menu when Folks is loaded so we can
+ * list all the personas of the contact. */
+ tp_g_signal_connect_object (self->priv->individual_mgr, "contacts-loaded",
+ G_CALLBACK (contacts_loaded_cb), self, 0);
+ }
+
return FALSE;
}