aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-persona-store.c
diff options
context:
space:
mode:
authorPhilip Withnall <philip.withnall@collabora.co.uk>2010-12-13 02:51:07 +0800
committerPhilip Withnall <philip.withnall@collabora.co.uk>2010-12-14 00:58:50 +0800
commitc6371ec63c928c848cbb5474cb005af5cc414230 (patch)
tree7c1f174c6e11a64bbe30a77fa7226e7aef36f133 /libempathy-gtk/empathy-persona-store.c
parent92ab34517a94d36ced95514e4fdbde17b2e6004f (diff)
downloadgsoc2013-empathy-c6371ec63c928c848cbb5474cb005af5cc414230.tar
gsoc2013-empathy-c6371ec63c928c848cbb5474cb005af5cc414230.tar.gz
gsoc2013-empathy-c6371ec63c928c848cbb5474cb005af5cc414230.tar.bz2
gsoc2013-empathy-c6371ec63c928c848cbb5474cb005af5cc414230.tar.lz
gsoc2013-empathy-c6371ec63c928c848cbb5474cb005af5cc414230.tar.xz
gsoc2013-empathy-c6371ec63c928c848cbb5474cb005af5cc414230.tar.zst
gsoc2013-empathy-c6371ec63c928c848cbb5474cb005af5cc414230.zip
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-gtk/empathy-persona-store.c')
-rw-r--r--libempathy-gtk/empathy-persona-store.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/libempathy-gtk/empathy-persona-store.c b/libempathy-gtk/empathy-persona-store.c
index e3c24bab4..b77e34d4b 100644
--- a/libempathy-gtk/empathy-persona-store.c
+++ b/libempathy-gtk/empathy-persona-store.c
@@ -438,7 +438,7 @@ update_persona (EmpathyPersonaStore *self,
gtk_tree_path_free (path);
/* Get online state now. */
- now_online = folks_presence_is_online (FOLKS_PRESENCE (persona));
+ now_online = folks_has_presence_is_online (FOLKS_HAS_PRESENCE (persona));
/* Get online state before. */
gtk_tree_model_get (GTK_TREE_MODEL (self), &iter,
@@ -484,9 +484,11 @@ update_persona (EmpathyPersonaStore *self,
EMPATHY_PERSONA_STORE_COL_DISPLAY_ID,
folks_persona_get_display_id (persona),
EMPATHY_PERSONA_STORE_COL_PRESENCE_TYPE,
- folks_presence_get_presence_type (FOLKS_PRESENCE (persona)),
+ folks_has_presence_get_presence_type (
+ FOLKS_HAS_PRESENCE (persona)),
EMPATHY_PERSONA_STORE_COL_STATUS,
- folks_presence_get_presence_message (FOLKS_PRESENCE (persona)),
+ folks_has_presence_get_presence_message (
+ FOLKS_HAS_PRESENCE (persona)),
EMPATHY_PERSONA_STORE_COL_IS_ONLINE, now_online,
EMPATHY_PERSONA_STORE_COL_CAN_AUDIO_CALL,
empathy_contact_get_capabilities (contact) &
@@ -626,8 +628,8 @@ state_sort_func (GtkTreeModel *model,
* the presences.
*/
ret_val = -tp_connection_presence_type_cmp_availability (
- folks_presence_get_presence_type (FOLKS_PRESENCE (persona_a)),
- folks_presence_get_presence_type (FOLKS_PRESENCE (persona_b)));
+ folks_has_presence_get_presence_type (FOLKS_HAS_PRESENCE (persona_a)),
+ folks_has_presence_get_presence_type (FOLKS_HAS_PRESENCE (persona_b)));
if (ret_val == 0) {
/* Fallback: compare by name et al. */