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-02 04:28:50 +0800 |
| commit | 2ef91742f4fedf3dfb398021619ac437dd4f3def (patch) | |
| tree | daeeab9ac90dd910c714602816b5213845a832bb /libempathy-gtk/empathy-individual-store.c | |
| parent | 5b04829ea31a9d18f92f76061aea3eb4d1571531 (diff) | |
| download | gsoc2013-empathy-2ef91742f4fedf3dfb398021619ac437dd4f3def.tar gsoc2013-empathy-2ef91742f4fedf3dfb398021619ac437dd4f3def.tar.gz gsoc2013-empathy-2ef91742f4fedf3dfb398021619ac437dd4f3def.tar.bz2 gsoc2013-empathy-2ef91742f4fedf3dfb398021619ac437dd4f3def.tar.lz gsoc2013-empathy-2ef91742f4fedf3dfb398021619ac437dd4f3def.tar.xz gsoc2013-empathy-2ef91742f4fedf3dfb398021619ac437dd4f3def.tar.zst gsoc2013-empathy-2ef91742f4fedf3dfb398021619ac437dd4f3def.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 | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c index 6ab52e86a..4146407e4 100644 --- a/libempathy-gtk/empathy-individual-store.c +++ b/libempathy-gtk/empathy-individual-store.c @@ -673,7 +673,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) { @@ -760,9 +761,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_individual_get_presence_type (individual), + folks_presence_owner_get_presence_type ( + FOLKS_PRESENCE_OWNER (individual)), EMPATHY_INDIVIDUAL_STORE_COL_STATUS, - folks_individual_get_presence_message (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, @@ -1422,8 +1425,12 @@ individual_store_state_sort_func (GtkTreeModel *model, /* If we managed to get this far, we can start looking at * the presences. */ - folks_presence_type_a = folks_individual_get_presence_type (individual_a); - folks_presence_type_b = folks_individual_get_presence_type (individual_b); + folks_presence_type_a = + folks_presence_owner_get_presence_type ( + FOLKS_PRESENCE_OWNER (individual_a)); + folks_presence_type_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); |