diff options
| author | Travis Reitter <travis.reitter@collabora.co.uk> | 2010-12-23 09:22:59 +0800 |
|---|---|---|
| committer | Travis Reitter <travis.reitter@collabora.co.uk> | 2011-02-01 08:16:21 +0800 |
| commit | 41f5717611c6bb3236ae78a187fd5753bbd9ccf3 (patch) | |
| tree | 2f10febc234021ae4e2bfab27f7f228b057003e9 /libempathy-gtk/empathy-persona-store.c | |
| parent | dfffa71d1d33714b331faaac367110716d56c72c (diff) | |
| download | gsoc2013-empathy-41f5717611c6bb3236ae78a187fd5753bbd9ccf3.tar gsoc2013-empathy-41f5717611c6bb3236ae78a187fd5753bbd9ccf3.tar.gz gsoc2013-empathy-41f5717611c6bb3236ae78a187fd5753bbd9ccf3.tar.bz2 gsoc2013-empathy-41f5717611c6bb3236ae78a187fd5753bbd9ccf3.tar.lz gsoc2013-empathy-41f5717611c6bb3236ae78a187fd5753bbd9ccf3.tar.xz gsoc2013-empathy-41f5717611c6bb3236ae78a187fd5753bbd9ccf3.tar.zst gsoc2013-empathy-41f5717611c6bb3236ae78a187fd5753bbd9ccf3.zip | |
Adjust for FolksHasPresence -> FolksPresenceOwner
Fixes bgo#637847.
Diffstat (limited to 'libempathy-gtk/empathy-persona-store.c')
| -rw-r--r-- | libempathy-gtk/empathy-persona-store.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/libempathy-gtk/empathy-persona-store.c b/libempathy-gtk/empathy-persona-store.c index b77e34d4b..d89ae9eb3 100644 --- a/libempathy-gtk/empathy-persona-store.c +++ b/libempathy-gtk/empathy-persona-store.c @@ -438,7 +438,8 @@ update_persona (EmpathyPersonaStore *self, gtk_tree_path_free (path); /* Get online state now. */ - now_online = folks_has_presence_is_online (FOLKS_HAS_PRESENCE (persona)); + now_online = folks_presence_owner_is_online ( + FOLKS_PRESENCE_OWNER (persona)); /* Get online state before. */ gtk_tree_model_get (GTK_TREE_MODEL (self), &iter, @@ -484,11 +485,11 @@ update_persona (EmpathyPersonaStore *self, EMPATHY_PERSONA_STORE_COL_DISPLAY_ID, folks_persona_get_display_id (persona), EMPATHY_PERSONA_STORE_COL_PRESENCE_TYPE, - folks_has_presence_get_presence_type ( - FOLKS_HAS_PRESENCE (persona)), + folks_presence_owner_get_presence_type ( + FOLKS_PRESENCE_OWNER (persona)), EMPATHY_PERSONA_STORE_COL_STATUS, - folks_has_presence_get_presence_message ( - FOLKS_HAS_PRESENCE (persona)), + folks_presence_owner_get_presence_message ( + FOLKS_PRESENCE_OWNER (persona)), EMPATHY_PERSONA_STORE_COL_IS_ONLINE, now_online, EMPATHY_PERSONA_STORE_COL_CAN_AUDIO_CALL, empathy_contact_get_capabilities (contact) & @@ -628,8 +629,9 @@ state_sort_func (GtkTreeModel *model, * the presences. */ ret_val = -tp_connection_presence_type_cmp_availability ( - folks_has_presence_get_presence_type (FOLKS_HAS_PRESENCE (persona_a)), - folks_has_presence_get_presence_type (FOLKS_HAS_PRESENCE (persona_b))); + folks_presence_owner_get_presence_type (FOLKS_PRESENCE_OWNER (persona_a)), + folks_presence_owner_get_presence_type ( + FOLKS_PRESENCE_OWNER (persona_b))); if (ret_val == 0) { /* Fallback: compare by name et al. */ |