aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy/empathy-contact.c
diff options
context:
space:
mode:
Diffstat (limited to 'libempathy/empathy-contact.c')
-rw-r--r--libempathy/empathy-contact.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index 48e045425..bfa9966da 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -746,6 +746,15 @@ contact_is_ready_func (GObject *contact,
ready = GPOINTER_TO_UINT (user_data);
+ /* When the name is NULL, empathy_contact_get_name() fallback to the id.
+ * When the caller want to wait the name to be ready, it also want to wait
+ * the id to be ready in case of fallback. */
+ if ((ready | EMPATHY_CONTACT_READY_NAME) &&
+ G_STR_EMPTY (priv->name))
+ {
+ ready |= EMPATHY_CONTACT_READY_ID;
+ }
+
return (priv->ready & ready) == ready;
}