diff options
| author | Philip Withnall <philip.withnall@collabora.co.uk> | 2010-12-12 18:51:07 +0000 |
|---|---|---|
| committer | Philip Withnall <philip.withnall@collabora.co.uk> | 2010-12-13 16:58:50 +0000 |
| commit | c6371ec63c928c848cbb5474cb005af5cc414230 (patch) | |
| tree | 7c1f174c6e11a64bbe30a77fa7226e7aef36f133 /libempathy/empathy-contact.c | |
| parent | 92ab34517a94d36ced95514e4fdbde17b2e6004f (diff) | |
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
Diffstat (limited to 'libempathy/empathy-contact.c')
| -rw-r--r-- | libempathy/empathy-contact.c | 20 |
1 files changed, 12 insertions, 8 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 |