empathy r1180 - trunk/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Thu Jun 19 12:47:55 2008
New Revision: 1180
URL: http://svn.gnome.org/viewvc/empathy?rev=1180&view=rev

Log:
Move contact_set_ready_flag() in _set_name() and _set_handle().


Modified:
   trunk/libempathy/empathy-contact.c

Modified: trunk/libempathy/empathy-contact.c
==============================================================================
--- trunk/libempathy/empathy-contact.c	(original)
+++ trunk/libempathy/empathy-contact.c	Thu Jun 19 12:47:55 2008
@@ -411,12 +411,12 @@
 	priv = GET_PRIV (contact);
 
 	g_object_ref (contact);
-	contact_set_ready_flag (contact, EMPATHY_CONTACT_READY_NAME);
 	if (tp_strdiff (name, priv->name)) {
 		g_free (priv->name);
 		priv->name = g_strdup (name);
 		g_object_notify (G_OBJECT (contact), "name");
 	}
+	contact_set_ready_flag (contact, EMPATHY_CONTACT_READY_NAME);
 	g_object_unref (contact);
 }
 
@@ -577,11 +577,11 @@
 	priv = GET_PRIV (contact);
 
 	g_object_ref (contact);
-	contact_set_ready_flag (contact, EMPATHY_CONTACT_READY_HANDLE);
 	if (handle != priv->handle) {
 		priv->handle = handle;
 		g_object_notify (G_OBJECT (contact), "handle");
 	}
+	contact_set_ready_flag (contact, EMPATHY_CONTACT_READY_HANDLE);
 	g_object_unref (contact);
 }