[empathy] Enforce use only of TpfPersonas

[Philip Withnall <pwithnall src gnome org>]

commit 0c9907c6a704bed65db982ac9ae5fe83912c647d
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Fri Jul 9 14:22:54 2010 +0100

    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 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index a5b7997..8384d27 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;
     }