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-individual-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-individual-store.c')
-rw-r--r-- | libempathy-gtk/empathy-individual-store.c | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c index 0add70ce3..feec91a57 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) { - FolksHasPresence *presence; + FolksPresenceOwner *presence; - /* We only want personas which implement FolksHasPresence */ - if (!FOLKS_IS_HAS_PRESENCE (l->data)) + /* We only want personas which implement FolksPresenceOwner */ + if (!FOLKS_IS_PRESENCE_OWNER (l->data)) continue; - presence = FOLKS_HAS_PRESENCE (l->data); + presence = FOLKS_PRESENCE_OWNER (l->data); - if (folks_has_presence_typecmp ( - folks_has_presence_get_presence_type (presence), + if (folks_presence_owner_typecmp ( + folks_presence_owner_get_presence_type (presence), presence_type) > 0) { TpContact *tp_contact; - presence_type = folks_has_presence_get_presence_type (presence); + presence_type = folks_presence_owner_get_presence_type (presence); tp_contact = tpf_persona_get_contact (TPF_PERSONA (l->data)); types = tp_contact_get_client_types (tp_contact); @@ -706,7 +706,8 @@ individual_store_contact_update (EmpathyIndividualStore *self, } /* Get online state now. */ - now_online = folks_has_presence_is_online (FOLKS_HAS_PRESENCE (individual)); + now_online = folks_presence_owner_is_online ( + FOLKS_PRESENCE_OWNER (individual)); if (!in_list) { @@ -796,11 +797,11 @@ individual_store_contact_update (EmpathyIndividualStore *self, EMPATHY_INDIVIDUAL_STORE_COL_NAME, folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)), EMPATHY_INDIVIDUAL_STORE_COL_PRESENCE_TYPE, - folks_has_presence_get_presence_type ( - FOLKS_HAS_PRESENCE (individual)), + folks_presence_owner_get_presence_type ( + FOLKS_PRESENCE_OWNER (individual)), EMPATHY_INDIVIDUAL_STORE_COL_STATUS, - folks_has_presence_get_presence_message ( - FOLKS_HAS_PRESENCE (individual)), + folks_presence_owner_get_presence_message ( + FOLKS_PRESENCE_OWNER (individual)), EMPATHY_INDIVIDUAL_STORE_COL_COMPACT, priv->is_compact, EMPATHY_INDIVIDUAL_STORE_COL_IS_GROUP, FALSE, EMPATHY_INDIVIDUAL_STORE_COL_IS_ONLINE, now_online, @@ -1467,9 +1468,11 @@ individual_store_state_sort_func (GtkTreeModel *model, * the presences. */ folks_presence_type_a = - folks_has_presence_get_presence_type (FOLKS_HAS_PRESENCE (individual_a)); + folks_presence_owner_get_presence_type ( + FOLKS_PRESENCE_OWNER (individual_a)); folks_presence_type_b = - folks_has_presence_get_presence_type (FOLKS_HAS_PRESENCE (individual_b)); + folks_presence_owner_get_presence_type ( + FOLKS_PRESENCE_OWNER (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); |