Bug 637097 — Port to latest folks API changes

Catch up with three interface renamings which have happened in folks master.
This bumps Empathy's folks dependency to 0.3.3. Closes: bgo#637097

2 files changed, 14 insertions, 10 deletions

diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index 5383187c1..86bb9f5a8 100644
--- a/libempathy/empathy-contact.c
+++ b/libempathy/empathy-contact.c
@@ -510,8 +510,8 @@ empathy_contact_set_presence_message (EmpathyContact *contact,
 
   if (priv->persona != NULL)
     {
-      folks_presence_set_presence_message (FOLKS_PRESENCE (priv->persona),
-          message);
+      folks_has_presence_set_presence_message (
+          FOLKS_HAS_PRESENCE (priv->persona), message);
     }
 }
 
@@ -991,7 +991,10 @@ empathy_contact_get_presence_message (EmpathyContact *contact)
   priv = GET_PRIV (contact);
 
   if (priv->persona != NULL)
-    return folks_presence_get_presence_message (FOLKS_PRESENCE (priv->persona));
+    {
+      return folks_has_presence_get_presence_message (
+          FOLKS_HAS_PRESENCE (priv->persona));
+    }
 
   return NULL;
 }
@@ -1791,15 +1794,16 @@ static int
 presence_cmp_func (EmpathyContact *a,
     EmpathyContact *b)
 {
-  FolksPresence *presence_a, *presence_b;
+  FolksHasPresence *presence_a, *presence_b;
 
-  presence_a = FOLKS_PRESENCE (empathy_contact_get_persona (a));
-  presence_b = FOLKS_PRESENCE (empathy_contact_get_persona (b));
+  presence_a = FOLKS_HAS_PRESENCE (empathy_contact_get_persona (a));
+  presence_b = FOLKS_HAS_PRESENCE (empathy_contact_get_persona (b));
 
   /* We negate the result because we're sorting in reverse order (i.e. such that
    * the Personas with the highest presence are at the beginning of the list. */
-  return -folks_presence_typecmp (folks_presence_get_presence_type (presence_a),
-      folks_presence_get_presence_type (presence_b));
+  return -folks_has_presence_typecmp (
+      folks_has_presence_get_presence_type (presence_a),
+      folks_has_presence_get_presence_type (presence_b));
 }
 
 static gint
diff --git a/libempathy/empathy-individual-manager.c b/libempathy/empathy-individual-manager.c
index 82884e4d1..29470b87e 100644
--- a/libempathy/empathy-individual-manager.c
+++ b/libempathy/empathy-individual-manager.c
@@ -82,8 +82,8 @@ individual_notify_is_favourite_cb (FolksIndividual *individual,
     GParamSpec *pspec,
     EmpathyIndividualManager *self)
 {
-  gboolean is_favourite = folks_favourite_get_is_favourite (
-      FOLKS_FAVOURITE (individual));
+  gboolean is_favourite = folks_favouritable_get_is_favourite (
+      FOLKS_FAVOURITABLE (individual));
   g_signal_emit (self, signals[FAVOURITES_CHANGED], 0, individual,
       is_favourite);
 }