aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorTravis Reitter <travis.reitter@collabora.co.uk>2011-03-11 14:07:44 +0800
committerTravis Reitter <travis.reitter@collabora.co.uk>2011-03-15 02:46:52 +0800
commit492b8ba0e7a37ad5b23ef7a3544dc6a2fd5e4eef (patch)
tree61a73414fcf25255d9d37ede52026556b306379b /libempathy
parentabf8b17d703c071f4fe91c09bac97c09314a2dc0 (diff)
downloadgsoc2013-empathy-492b8ba0e7a37ad5b23ef7a3544dc6a2fd5e4eef.tar
gsoc2013-empathy-492b8ba0e7a37ad5b23ef7a3544dc6a2fd5e4eef.tar.gz
gsoc2013-empathy-492b8ba0e7a37ad5b23ef7a3544dc6a2fd5e4eef.tar.bz2
gsoc2013-empathy-492b8ba0e7a37ad5b23ef7a3544dc6a2fd5e4eef.tar.lz
gsoc2013-empathy-492b8ba0e7a37ad5b23ef7a3544dc6a2fd5e4eef.tar.xz
gsoc2013-empathy-492b8ba0e7a37ad5b23ef7a3544dc6a2fd5e4eef.tar.zst
gsoc2013-empathy-492b8ba0e7a37ad5b23ef7a3544dc6a2fd5e4eef.zip
Adjust for Folks PresenceOwner -> PresenceDetails rename
Fixes bgo#644470 - Empathy needs to catch up with Folks interface name change (API/ABI breaks)
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-contact.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
index ad462b203..bf0da384c 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_owner_set_presence_message (
- FOLKS_PRESENCE_OWNER (priv->persona), message);
+ folks_presence_details_set_presence_message (
+ FOLKS_PRESENCE_DETAILS (priv->persona), message);
}
}
@@ -992,8 +992,8 @@ empathy_contact_get_presence_message (EmpathyContact *contact)
priv = GET_PRIV (contact);
if (priv->persona != NULL)
- return folks_presence_owner_get_presence_message (
- FOLKS_PRESENCE_OWNER (priv->persona));
+ return folks_presence_details_get_presence_message (
+ FOLKS_PRESENCE_DETAILS (priv->persona));
if (priv->tp_contact != NULL)
return tp_contact_get_presence_message (priv->tp_contact);
@@ -1801,16 +1801,16 @@ static int
presence_cmp_func (EmpathyContact *a,
EmpathyContact *b)
{
- FolksPresenceOwner *presence_a, *presence_b;
+ FolksPresenceDetails *presence_a, *presence_b;
- presence_a = FOLKS_PRESENCE_OWNER (empathy_contact_get_persona (a));
- presence_b = FOLKS_PRESENCE_OWNER (empathy_contact_get_persona (b));
+ presence_a = FOLKS_PRESENCE_DETAILS (empathy_contact_get_persona (a));
+ presence_b = FOLKS_PRESENCE_DETAILS (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_owner_typecmp (
- folks_presence_owner_get_presence_type (presence_a),
- folks_presence_owner_get_presence_type (presence_b));
+ return -folks_presence_details_typecmp (
+ folks_presence_details_get_presence_type (presence_a),
+ folks_presence_details_get_presence_type (presence_b));
}
static gint