From 373413516c18200750da27f385da588da6c297cc Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Mon, 10 May 2010 12:34:42 +0200 Subject: Add empathy_contact_dup_from_tp_contact() This API make sure to return a singleton EmpathyContact for any TpContact --- libempathy/empathy-contact.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'libempathy/empathy-contact.c') diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index 224ad6e49..56b7aa42d 100644 --- a/libempathy/empathy-contact.c +++ b/libempathy/empathy-contact.c @@ -111,6 +111,9 @@ enum { static guint signals[LAST_SIGNAL]; +/* TpContact* -> EmpathyContact* */ +static GHashTable *contacts_table = NULL; + static void tp_contact_notify_cb (TpContact *tp_contact, GParamSpec *param, @@ -162,6 +165,7 @@ contact_dispose (GObject *object) if (priv->tp_contact) { + g_hash_table_remove (contacts_table, priv->tp_contact); g_signal_handlers_disconnect_by_func (priv->tp_contact, tp_contact_notify_cb, object); g_object_unref (priv->tp_contact); @@ -340,6 +344,8 @@ set_tp_contact (EmpathyContact *contact, { EmpathyContactPriv *priv = GET_PRIV (contact); GHashTable *location; + TpHandle self_handle; + TpHandle handle; if (tp_contact == NULL) return; @@ -357,6 +363,14 @@ set_tp_contact (EmpathyContact *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); } @@ -1466,3 +1480,32 @@ contact_set_avatar_from_tp_contact (EmpathyContact *contact) } } +EmpathyContact * +empathy_contact_dup_from_tp_contact (TpContact *tp_contact) +{ + EmpathyContact *contact = NULL; + + g_return_val_if_fail (TP_IS_CONTACT (tp_contact), NULL); + + if (contacts_table == NULL) + contacts_table = g_hash_table_new (g_direct_hash, g_direct_equal); + else + contact = g_hash_table_lookup (contacts_table, tp_contact); + + if (contact == NULL) + { + contact = empathy_contact_new (tp_contact); + + /* The hash table does not keep any ref. + * contact keeps a ref to tp_contact, and is removed from the table in + * contact_dispose() */ + g_hash_table_insert (contacts_table, tp_contact, contact); + } + else + { + g_object_ref (contact); + } + + return contact; +} + -- cgit v1.2.3