aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorPhilip Withnall <philip.withnall@collabora.co.uk>2010-07-09 21:22:54 +0800
committerTravis Reitter <treitter@gmail.com>2010-07-22 04:25:35 +0800
commit0c9907c6a704bed65db982ac9ae5fe83912c647d (patch)
treea57fbae51e6d108e9d9aabcaa6f208839cc90e8d /libempathy
parente922ae799989e073cb6649578555ad686bcb0fc8 (diff)
downloadgsoc2013-empathy-0c9907c6a704bed65db982ac9ae5fe83912c647d.tar
gsoc2013-empathy-0c9907c6a704bed65db982ac9ae5fe83912c647d.tar.gz
gsoc2013-empathy-0c9907c6a704bed65db982ac9ae5fe83912c647d.tar.bz2
gsoc2013-empathy-0c9907c6a704bed65db982ac9ae5fe83912c647d.tar.lz
gsoc2013-empathy-0c9907c6a704bed65db982ac9ae5fe83912c647d.tar.xz
gsoc2013-empathy-0c9907c6a704bed65db982ac9ae5fe83912c647d.tar.zst
gsoc2013-empathy-0c9907c6a704bed65db982ac9ae5fe83912c647d.zip
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.
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-contact.c6
1 files changed, 2 insertions, 4 deletions
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;
}