From 0c9907c6a704bed65db982ac9ae5fe83912c647d Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Fri, 9 Jul 2010 14:22:54 +0100 Subject: Enforce use only of TpfPersonas If we only allow EmpathyContacts to be linked to TpfPersonas, we can make some assumptions about which interfaces are available on the personas for efficiency purposes. --- libempathy/empathy-contact.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'libempathy/empathy-contact.c') diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index a5b799793..8384d2714 100644 --- a/libempathy/empathy-contact.c +++ b/libempathy/empathy-contact.c @@ -803,7 +803,7 @@ empathy_contact_set_persona (EmpathyContact *contact, EmpathyContactPriv *priv; g_return_if_fail (EMPATHY_IS_CONTACT (contact)); - g_return_if_fail (FOLKS_IS_PERSONA (persona)); + g_return_if_fail (TPF_IS_PERSONA (persona)); priv = GET_PRIV (contact); @@ -824,9 +824,7 @@ empathy_contact_set_persona (EmpathyContact *contact, /* Set the persona's groups */ if (priv->groups != NULL) { - if (FOLKS_IS_GROUPS (persona)) - folks_groups_set_groups (FOLKS_GROUPS (persona), priv->groups); - + folks_groups_set_groups (FOLKS_GROUPS (persona), priv->groups); g_hash_table_destroy (priv->groups); priv->groups = NULL; } -- cgit v1.2.3