From ab1bd1a137ac8ffd7245669663e739e309a0a86f Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Mon, 30 Aug 2010 15:31:21 +0200
Subject: contact: get info from the tp-contact in constructed (#628315)

Doing it in set_property is racy:
- The tp-contact property is set. We use the contact to set the capabilities
of the contact
- The "capabilities" property has not be defined so GLib sets its default
value (unknown) and so override the real capabilities of the contact.
---
 libempathy/empathy-contact.c | 75 ++++++++++++++++++++++----------------------
 1 file changed, 37 insertions(+), 38 deletions(-)

(limited to 'libempathy')

diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index 60403145d..c4be98135 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -212,6 +212,41 @@ contact_dispose (GObject *object)
   G_OBJECT_CLASS (empathy_contact_parent_class)->dispose (object);
 }
 
+static void
+contact_constructed (GObject *object)
+{
+  EmpathyContact *contact = (EmpathyContact *) object;
+  EmpathyContactPriv *priv = GET_PRIV (contact);
+  GHashTable *location;
+  TpHandle self_handle;
+  TpHandle handle;
+
+  if (priv->tp_contact == NULL)
+    return;
+
+  priv->presence = empathy_contact_get_presence (contact);
+
+  location = tp_contact_get_location (priv->tp_contact);
+  if (location != NULL)
+    empathy_contact_set_location (contact, location);
+
+  set_capabilities_from_tp_caps (contact,
+      tp_contact_get_capabilities (priv->tp_contact));
+
+  contact_set_avatar_from_tp_contact (contact);
+
+  /* Set is-user property. Note that it could still be the handle is
+   * different from the connection's self handle, in the case the handle
+   * comes from a group interface. */
+  self_handle = tp_connection_get_self_handle (
+      tp_contact_get_connection (priv->tp_contact));
+  handle = tp_contact_get_handle (priv->tp_contact);
+  empathy_contact_set_is_user (contact, self_handle == handle);
+
+  g_signal_connect (priv->tp_contact, "notify",
+    G_CALLBACK (tp_contact_notify_cb), contact);
+}
+
 static void
 empathy_contact_class_init (EmpathyContactClass *class)
 {
@@ -223,6 +258,7 @@ empathy_contact_class_init (EmpathyContactClass *class)
   object_class->dispose = contact_dispose;
   object_class->get_property = contact_get_property;
   object_class->set_property = contact_set_property;
+  object_class->constructed = contact_constructed;
 
   g_object_class_install_property (object_class,
       PROP_TP_CONTACT,
@@ -369,43 +405,6 @@ contact_finalize (GObject *object)
   G_OBJECT_CLASS (empathy_contact_parent_class)->finalize (object);
 }
 
-static void
-set_tp_contact (EmpathyContact *contact,
-                TpContact *tp_contact)
-{
-  EmpathyContactPriv *priv = GET_PRIV (contact);
-  GHashTable *location;
-  TpHandle self_handle;
-  TpHandle handle;
-
-  if (tp_contact == NULL)
-    return;
-
-  g_assert (priv->tp_contact == NULL);
-  priv->tp_contact = g_object_ref (tp_contact);
-  priv->presence = empathy_contact_get_presence (contact);
-
-  location = tp_contact_get_location (tp_contact);
-  if (location != NULL)
-    empathy_contact_set_location (contact, location);
-
-  set_capabilities_from_tp_caps (contact,
-      tp_contact_get_capabilities (tp_contact));
-
-  contact_set_avatar_from_tp_contact (contact);
-
-  /* Set is-user property. Note that it could still be the handle is
-   * different from the connection's self handle, in the case the handle
-   * comes from a group interface. */
-  self_handle = tp_connection_get_self_handle (
-      tp_contact_get_connection (tp_contact));
-  handle = tp_contact_get_handle (tp_contact);
-  empathy_contact_set_is_user (contact, self_handle == handle);
-
-  g_signal_connect (priv->tp_contact, "notify",
-    G_CALLBACK (tp_contact_notify_cb), contact);
-}
-
 static void
 empathy_contact_set_capabilities (EmpathyContact *contact,
                                   EmpathyCapabilities capabilities)
@@ -568,7 +567,7 @@ contact_set_property (GObject *object,
   switch (param_id)
     {
       case PROP_TP_CONTACT:
-        set_tp_contact (contact, g_value_get_object (value));
+        priv->tp_contact = g_value_dup_object (value);
         break;
       case PROP_ACCOUNT:
         g_assert (priv->account == NULL);
-- 
cgit v1.2.3