Make sure we don't expect contact id and handle to be directly ready. Add some _run_until_ready.

svn path=/trunk/; revision=755

1 files changed, 5 insertions, 3 deletions

diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
index 0c3f40dc1..c0b4596de 100644
--- a/libempathy-gtk/empathy-contact-widget.c
+++ b/libempathy-gtk/empathy-contact-widget.c
@@ -306,9 +306,7 @@ static void
 contact_widget_set_contact (EmpathyContactWidget *information,
 			    EmpathyContact        *contact)
 {
-	if (contact == information->contact ||
-	    (contact && information->contact &&
-	     empathy_contact_equal (contact, information->contact))) {
+	if (contact == information->contact) {
 		return;
 	}
 
@@ -512,6 +510,10 @@ contact_widget_change_contact (EmpathyContactWidget *information)
 	}
 
 	if (contact) {
+		empathy_contact_run_until_ready (contact,
+						 EMPATHY_CONTACT_READY_HANDLE |
+						 EMPATHY_CONTACT_READY_ID,
+						 NULL);
 		contact_widget_set_contact (information, contact);
 		g_object_unref (contact);
 	}