diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-03-16 17:11:26 +0800 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-03-16 17:24:59 +0800 |
commit | cb2741bee8b6808953a6afeea90114f123a47982 (patch) | |
tree | e1b0df9a14caf29e7047ec403db51d0752533895 /libempathy-gtk/empathy-individual-store.c | |
parent | 15761dfafa40dce3e5acb2f9fecc5b808fa11e47 (diff) | |
download | gsoc2013-empathy-cb2741bee8b6808953a6afeea90114f123a47982.tar gsoc2013-empathy-cb2741bee8b6808953a6afeea90114f123a47982.tar.gz gsoc2013-empathy-cb2741bee8b6808953a6afeea90114f123a47982.tar.bz2 gsoc2013-empathy-cb2741bee8b6808953a6afeea90114f123a47982.tar.lz gsoc2013-empathy-cb2741bee8b6808953a6afeea90114f123a47982.tar.xz gsoc2013-empathy-cb2741bee8b6808953a6afeea90114f123a47982.tar.zst gsoc2013-empathy-cb2741bee8b6808953a6afeea90114f123a47982.zip |
depends on folks 0.4.0
This is based on Travis's commits from master.
Diffstat (limited to 'libempathy-gtk/empathy-individual-store.c')
-rw-r--r-- | libempathy-gtk/empathy-individual-store.c | 52 |
1 files changed, 28 insertions, 24 deletions
diff --git a/libempathy-gtk/empathy-individual-store.c b/libempathy-gtk/empathy-individual-store.c index 5035b77d3..242bad2be 100644 --- a/libempathy-gtk/empathy-individual-store.c +++ b/libempathy-gtk/empathy-individual-store.c @@ -168,7 +168,7 @@ add_individual_to_store (GtkTreeStore *self, gtk_tree_store_insert_with_values (self, iter, parent, 0, EMPATHY_INDIVIDUAL_STORE_COL_NAME, - folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)), + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual)), EMPATHY_INDIVIDUAL_STORE_COL_INDIVIDUAL, individual, EMPATHY_INDIVIDUAL_STORE_COL_IS_GROUP, FALSE, EMPATHY_INDIVIDUAL_STORE_COL_IS_SEPARATOR, FALSE, @@ -387,12 +387,14 @@ individual_store_add_individual (EmpathyIndividualStore *self, priv = GET_PRIV (self); - if (EMP_STR_EMPTY (folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)))) + if (EMP_STR_EMPTY (folks_alias_details_get_alias ( + FOLKS_ALIAS_DETAILS (individual)))) return; if (priv->show_groups) { - group_set = folks_groupable_get_groups (FOLKS_GROUPABLE (individual)); + group_set = folks_group_details_get_groups ( + FOLKS_GROUP_DETAILS (individual)); groups = g_hash_table_get_keys (group_set); } @@ -445,7 +447,8 @@ individual_store_add_individual (EmpathyIndividualStore *self, g_list_free (groups); if (priv->show_groups && - folks_favouritable_get_is_favourite (FOLKS_FAVOURITABLE (individual))) + folks_favourite_details_get_is_favourite ( + FOLKS_FAVOURITE_DETAILS (individual))) { /* Add contact to the fake 'Favorites' group */ GtkTreeIter iter_group; @@ -525,7 +528,7 @@ individual_store_contact_active_new (EmpathyIndividualStore *self, ShowActiveData *data; DEBUG ("Individual'%s' now active, and %s be removed", - folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)), + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual)), remove_ ? "WILL" : "WILL NOT"); data = g_slice_new0 (ShowActiveData); @@ -570,12 +573,13 @@ individual_store_contact_active_cb (ShowActiveData *data) if (data->remove) { DEBUG ("Individual'%s' active timeout, removing item", - folks_aliasable_get_alias (FOLKS_ALIASABLE (data->individual))); + folks_alias_details_get_alias ( + FOLKS_ALIAS_DETAILS (data->individual))); individual_store_remove_individual (data->self, data->individual); } DEBUG ("Individual'%s' no longer active", - folks_aliasable_get_alias (FOLKS_ALIASABLE (data->individual))); + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (data->individual))); individual_store_contact_set_active (data->self, data->individual, FALSE, TRUE); @@ -604,7 +608,7 @@ individual_avatar_pixbuf_received_cb (FolksIndividual *individual, if (error != NULL) { DEBUG ("failed to retrieve pixbuf for individual %s: %s", - folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)), + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual)), error->message); g_clear_error (&error); } @@ -673,13 +677,13 @@ 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) { DEBUG ("Individual'%s' in list:NO, should be:YES", - folks_aliasable_get_alias (FOLKS_ALIASABLE (individual))); + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual))); individual_store_add_individual (self, individual); @@ -693,7 +697,7 @@ individual_store_contact_update (EmpathyIndividualStore *self, else { DEBUG ("Individual'%s' in list:YES, should be:YES", - folks_aliasable_get_alias (FOLKS_ALIASABLE (individual))); + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual))); /* Get online state before. */ if (iters && g_list_length (iters) > 0) @@ -759,13 +763,13 @@ individual_store_contact_update (EmpathyIndividualStore *self, EMPATHY_INDIVIDUAL_STORE_COL_ICON_STATUS, pixbuf_status, EMPATHY_INDIVIDUAL_STORE_COL_PIXBUF_AVATAR_VISIBLE, show_avatar, EMPATHY_INDIVIDUAL_STORE_COL_NAME, - folks_aliasable_get_alias (FOLKS_ALIASABLE (individual)), + 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, @@ -804,7 +808,7 @@ individual_store_individual_updated_cb (FolksIndividual *individual, EmpathyIndividualStore *self) { DEBUG ("Individual'%s' updated, checking roster is in sync...", - folks_aliasable_get_alias (FOLKS_ALIASABLE (individual))); + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual))); individual_store_contact_update (self, individual); } @@ -1353,8 +1357,8 @@ individual_store_contact_sort (FolksIndividual *individual_a, /* alias */ ret_val = g_utf8_collate ( - folks_aliasable_get_alias (FOLKS_ALIASABLE (individual_a)), - folks_aliasable_get_alias (FOLKS_ALIASABLE (individual_b))); + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual_a)), + folks_alias_details_get_alias (FOLKS_ALIAS_DETAILS (individual_b))); if (ret_val != 0) goto out; @@ -1426,11 +1430,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); |