[empathy] Don't conflate TpfPersona and FolksPersona.

[Travis Reitter <treitter src gnome org>]

commit faa40483fd000099a0593c09d0e92b938beaaaa7
Author: Travis Reitter <travis reitter collabora co uk>
Date:   Mon May 2 17:21:04 2011 -0700

    Don't conflate TpfPersona and FolksPersona.

 libempathy-gtk/empathy-individual-store.c  |    4 ++--
 libempathy-gtk/empathy-individual-widget.c |   14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c
index ef786d7..b804b22 100644
--- a/libempathy-gtk/empathy-individual-store.c
+++ b/libempathy-gtk/empathy-individual-store.c
@@ -166,8 +166,8 @@ individual_get_client_types (FolksIndividual *individual)
     {
       FolksPresenceDetails *presence;
 
-      /* We only want personas which implement FolksPresenceDetails */
-      if (!FOLKS_IS_PRESENCE_DETAILS (l->data))
+      /* We only want personas which have presence and a TpContact */
+      if (!empathy_folks_persona_is_interesting (persona))
         continue;
 
       presence = FOLKS_PRESENCE_DETAILS (l->data);
diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index dc45191..d0697d2 100644
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -229,20 +229,20 @@ update_weak_contact (EmpathyIndividualWidget *self)
       for (l = personas; l != NULL; l = l->next)
         {
           FolksPresenceDetails *presence;
+          FolksPresenceType presence_type_cur;
 
-          /* We only want personas which implement FolksPresence */
-          if (!FOLKS_IS_PRESENCE_DETAILS (l->data))
+          /* We only want personas which have presence and a TpContact */
+          if (!empathy_folks_persona_is_interesting (FOLKS_PERSONA (presence)))
             continue;
 
           presence = FOLKS_PRESENCE_DETAILS (l->data);
+          presence_type_cur = folks_presence_details_get_presence_type (
+              presence);
 
           if (folks_presence_details_typecmp (
-                  folks_presence_details_get_presence_type (presence),
-                  presence_type) > 0 &&
-              empathy_folks_persona_is_interesting (FOLKS_PERSONA (presence)))
+                presence_type_cur, presence_type) > 0)
             {
-              presence_type = folks_presence_details_get_presence_type (
-                  presence);
+              presence_type = presence_type_cur;
               tp_contact = tpf_persona_get_contact (TPF_PERSONA (l->data));
             }
         }