diff options
| author | Travis Reitter <travis.reitter@collabora.co.uk> | 2011-03-11 14:07:44 +0800 |
|---|---|---|
| committer | Travis Reitter <travis.reitter@collabora.co.uk> | 2011-03-15 02:46:52 +0800 |
| commit | 492b8ba0e7a37ad5b23ef7a3544dc6a2fd5e4eef (patch) | |
| tree | 61a73414fcf25255d9d37ede52026556b306379b /libempathy-gtk/empathy-persona-store.c | |
| parent | abf8b17d703c071f4fe91c09bac97c09314a2dc0 (diff) | |
| download | gsoc2013-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-gtk/empathy-persona-store.c')
| -rw-r--r-- | libempathy-gtk/empathy-persona-store.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/libempathy-gtk/empathy-persona-store.c b/libempathy-gtk/empathy-persona-store.c index 6e9aa746f..d0614fd95 100644 --- a/libempathy-gtk/empathy-persona-store.c +++ b/libempathy-gtk/empathy-persona-store.c @@ -438,8 +438,8 @@ update_persona (EmpathyPersonaStore *self, gtk_tree_path_free (path); /* Get online state now. */ - now_online = folks_presence_owner_is_online ( - FOLKS_PRESENCE_OWNER (persona)); + now_online = folks_presence_details_is_online ( + FOLKS_PRESENCE_DETAILS (persona)); /* Get online state before. */ gtk_tree_model_get (GTK_TREE_MODEL (self), &iter, @@ -485,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_presence_owner_get_presence_type ( - FOLKS_PRESENCE_OWNER (persona)), + folks_presence_details_get_presence_type ( + FOLKS_PRESENCE_DETAILS (persona)), EMPATHY_PERSONA_STORE_COL_STATUS, - folks_presence_owner_get_presence_message ( - FOLKS_PRESENCE_OWNER (persona)), + folks_presence_details_get_presence_message ( + FOLKS_PRESENCE_DETAILS (persona)), EMPATHY_PERSONA_STORE_COL_IS_ONLINE, now_online, EMPATHY_PERSONA_STORE_COL_CAN_AUDIO_CALL, empathy_contact_get_capabilities (contact) & @@ -629,9 +629,10 @@ state_sort_func (GtkTreeModel *model, * the presences. */ ret_val = -tp_connection_presence_type_cmp_availability ( - folks_presence_owner_get_presence_type (FOLKS_PRESENCE_OWNER (persona_a)), - folks_presence_owner_get_presence_type ( - FOLKS_PRESENCE_OWNER (persona_b))); + folks_presence_details_get_presence_type ( + FOLKS_PRESENCE_DETAILS (persona_a)), + folks_presence_details_get_presence_type ( + FOLKS_PRESENCE_DETAILS (persona_b))); if (ret_val == 0) { /* Fallback: compare by name et al. */ |