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-individual-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-individual-store.c')
-rw-r--r-- | libempathy-gtk/empathy-individual-store.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c index 95b41ca85..b95da2b47 100644 --- a/libempathy-gtk/empathy-individual-store.c +++ b/libempathy-gtk/empathy-individual-store.c @@ -164,21 +164,21 @@ individual_get_client_types (FolksIndividual *individual) personas = folks_individual_get_personas (individual); for (l = personas; l != NULL; l = l->next) { - FolksPresenceOwner *presence; + FolksPresenceDetails *presence; - /* We only want personas which implement FolksPresenceOwner */ - if (!FOLKS_IS_PRESENCE_OWNER (l->data)) + /* We only want personas which implement FolksPresenceDetails */ + if (!FOLKS_IS_PRESENCE_DETAILS (l->data)) continue; - presence = FOLKS_PRESENCE_OWNER (l->data); + presence = FOLKS_PRESENCE_DETAILS (l->data); - if (folks_presence_owner_typecmp ( - folks_presence_owner_get_presence_type (presence), + if (folks_presence_details_typecmp ( + folks_presence_details_get_presence_type (presence), presence_type) > 0) { TpContact *tp_contact; - presence_type = folks_presence_owner_get_presence_type (presence); + presence_type = folks_presence_details_get_presence_type (presence); tp_contact = tpf_persona_get_contact (TPF_PERSONA (l->data)); types = tp_contact_get_client_types (tp_contact); @@ -710,8 +710,8 @@ individual_store_contact_update (EmpathyIndividualStore *self, } /* Get online state now. */ - now_online = folks_presence_owner_is_online ( - FOLKS_PRESENCE_OWNER (individual)); + now_online = folks_presence_details_is_online ( + FOLKS_PRESENCE_DETAILS (individual)); if (!in_list) { @@ -801,11 +801,11 @@ individual_store_contact_update (EmpathyIndividualStore *self, EMPATHY_INDIVIDUAL_STORE_COL_NAME, folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual)), EMPATHY_INDIVIDUAL_STORE_COL_PRESENCE_TYPE, - folks_presence_owner_get_presence_type ( - FOLKS_PRESENCE_OWNER (individual)), + folks_presence_details_get_presence_type ( + FOLKS_PRESENCE_DETAILS (individual)), EMPATHY_INDIVIDUAL_STORE_COL_STATUS, - folks_presence_owner_get_presence_message ( - FOLKS_PRESENCE_OWNER (individual)), + folks_presence_details_get_presence_message ( + FOLKS_PRESENCE_DETAILS (individual)), EMPATHY_INDIVIDUAL_STORE_COL_COMPACT, priv->is_compact, EMPATHY_INDIVIDUAL_STORE_COL_IS_GROUP, FALSE, EMPATHY_INDIVIDUAL_STORE_COL_IS_ONLINE, now_online, @@ -1472,11 +1472,11 @@ individual_store_state_sort_func (GtkTreeModel *model, * the presences. */ folks_presence_type_a = - folks_presence_owner_get_presence_type ( - FOLKS_PRESENCE_OWNER (individual_a)); + folks_presence_details_get_presence_type ( + FOLKS_PRESENCE_DETAILS (individual_a)); folks_presence_type_b = - folks_presence_owner_get_presence_type ( - FOLKS_PRESENCE_OWNER (individual_b)); + folks_presence_details_get_presence_type ( + FOLKS_PRESENCE_DETAILS (individual_b)); tp_presence_a = empathy_folks_presence_type_to_tp (folks_presence_type_a); tp_presence_b = empathy_folks_presence_type_to_tp (folks_presence_type_b); |