empathy r1203 - trunk/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Mon Jul  7 20:41:43 2008
New Revision: 1203
URL: http://svn.gnome.org/viewvc/empathy?rev=1203&view=rev

Log:
Before emitting a message make sure the ID is also ready. Fixes bug #540360.


Modified:
   trunk/libempathy/empathy-tp-chat.c

Modified: trunk/libempathy/empathy-tp-chat.c
==============================================================================
--- trunk/libempathy/empathy-tp-chat.c	(original)
+++ trunk/libempathy/empathy-tp-chat.c	Mon Jul  7 20:41:43 2008
@@ -300,7 +300,8 @@
 		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 @@
 
 	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;