diff options
-rw-r--r-- | libempathy/empathy-tp-chat.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c index 7b09a8a5d..20c9d8f67 100644 --- a/libempathy/empathy-tp-chat.c +++ b/libempathy/empathy-tp-chat.c @@ -300,7 +300,8 @@ tp_chat_sender_ready_notify_cb (EmpathyContact *contact, sender = empathy_message_get_sender (message); ready = empathy_contact_get_ready (sender); - if (!(ready & EMPATHY_CONTACT_READY_NAME)) { + if ((ready & EMPATHY_CONTACT_READY_NAME) == 0 || + (ready & EMPATHY_CONTACT_READY_ID) == 0) { break; } @@ -342,7 +343,8 @@ tp_chat_emit_or_queue_message (EmpathyTpChat *chat, sender = empathy_message_get_sender (message); ready = empathy_contact_get_ready (sender); - if (ready & EMPATHY_CONTACT_READY_NAME) { + if ((ready & EMPATHY_CONTACT_READY_NAME) && + (ready & EMPATHY_CONTACT_READY_ID)) { DEBUG ("Message queue empty and sender ready"); g_signal_emit (chat, signals[MESSAGE_RECEIVED], 0, message); return; |