From 41f5717611c6bb3236ae78a187fd5753bbd9ccf3 Mon Sep 17 00:00:00 2001 From: Travis Reitter Date: Wed, 22 Dec 2010 17:22:59 -0800 Subject: Adjust for FolksHasPresence -> FolksPresenceOwner Fixes bgo#637847. --- libempathy/empathy-contact.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'libempathy/empathy-contact.c') diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c index 86bb9f5a8..76091e455 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_has_presence_set_presence_message ( - FOLKS_HAS_PRESENCE (priv->persona), message); + folks_presence_owner_set_presence_message ( + FOLKS_PRESENCE_OWNER (priv->persona), message); } } @@ -992,8 +992,8 @@ empathy_contact_get_presence_message (EmpathyContact *contact) if (priv->persona != NULL) { - return folks_has_presence_get_presence_message ( - FOLKS_HAS_PRESENCE (priv->persona)); + return folks_presence_owner_get_presence_message ( + FOLKS_PRESENCE_OWNER (priv->persona)); } return NULL; @@ -1794,16 +1794,16 @@ static int presence_cmp_func (EmpathyContact *a, EmpathyContact *b) { - FolksHasPresence *presence_a, *presence_b; + FolksPresenceOwner *presence_a, *presence_b; - presence_a = FOLKS_HAS_PRESENCE (empathy_contact_get_persona (a)); - presence_b = FOLKS_HAS_PRESENCE (empathy_contact_get_persona (b)); + presence_a = FOLKS_PRESENCE_OWNER (empathy_contact_get_persona (a)); + presence_b = FOLKS_PRESENCE_OWNER (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_has_presence_typecmp ( - folks_has_presence_get_presence_type (presence_a), - folks_has_presence_get_presence_type (presence_b)); + return -folks_presence_owner_typecmp ( + folks_presence_owner_get_presence_type (presence_a), + folks_presence_owner_get_presence_type (presence_b)); } static gint -- cgit v1.2.3