if (roster_group != NULL)
return EMPATHY_ROSTER_GROUP (roster_group);
- if (!tp_strdiff (group, EMPATHY_ROSTER_VIEW_GROUP_TOP_GROUP))
+ if (!tp_strdiff (group, EMPATHY_ROSTER_MODEL_GROUP_TOP_GROUP))
roster_group = empathy_roster_group_new (group, "emblem-favorite-symbolic");
- else if (!tp_strdiff (group, EMPATHY_ROSTER_VIEW_GROUP_PEOPLE_NEARBY))
+ else if (!tp_strdiff (group, EMPATHY_ROSTER_MODEL_GROUP_PEOPLE_NEARBY))
roster_group = empathy_roster_group_new (group, "im-local-xmpp");
else
roster_group = empathy_roster_group_new (group, NULL);
FOLKS_FAVOURITE_DETAILS (individual)) ||
g_list_index (tops, individual) != -1)
{
- add_to_group (self, individual, EMPATHY_ROSTER_VIEW_GROUP_TOP_GROUP);
+ add_to_group (self, individual, EMPATHY_ROSTER_MODEL_GROUP_TOP_GROUP);
}
groups = empathy_roster_model_get_groups_for_individual (self->priv->model,
else
{
/* No group, adds to Ungrouped */
- add_to_group (self, individual, EMPATHY_ROSTER_VIEW_GROUP_UNGROUPED);
+ add_to_group (self, individual, EMPATHY_ROSTER_MODEL_GROUP_UNGROUPED);
}
g_list_free (groups);
compare_group_names (const gchar *group_a,
const gchar *group_b)
{
- if (!tp_strdiff (group_a, EMPATHY_ROSTER_VIEW_GROUP_TOP_GROUP))
+ if (!tp_strdiff (group_a, EMPATHY_ROSTER_MODEL_GROUP_TOP_GROUP))
return -1;
- if (!tp_strdiff (group_b, EMPATHY_ROSTER_VIEW_GROUP_TOP_GROUP))
+ if (!tp_strdiff (group_b, EMPATHY_ROSTER_MODEL_GROUP_TOP_GROUP))
return 1;
- if (!tp_strdiff (group_a, EMPATHY_ROSTER_VIEW_GROUP_UNGROUPED))
+ if (!tp_strdiff (group_a, EMPATHY_ROSTER_MODEL_GROUP_UNGROUPED))
return 1;
- else if (!tp_strdiff (group_b, EMPATHY_ROSTER_VIEW_GROUP_UNGROUPED))
+ else if (!tp_strdiff (group_b, EMPATHY_ROSTER_MODEL_GROUP_UNGROUPED))
return -1;
return g_ascii_strcasecmp (group_a, group_b);
group_name = empathy_roster_contact_get_group (contact);
- if (!tp_strdiff (group_name, EMPATHY_ROSTER_VIEW_GROUP_TOP_GROUP))
+ if (!tp_strdiff (group_name, EMPATHY_ROSTER_MODEL_GROUP_TOP_GROUP))
/* Always display favourite contact in group mode only in the
* 'top group'*/
return TRUE;
if (g_hash_table_size (contacts) == 0)
{
- add_to_group (self, individual, EMPATHY_ROSTER_VIEW_GROUP_UNGROUPED);
+ add_to_group (self, individual, EMPATHY_ROSTER_MODEL_GROUP_UNGROUPED);
}
roster_group = lookup_roster_group (self, group);
tops = empathy_roster_model_get_top_individuals (self->priv->model);
group = g_hash_table_lookup (self->priv->roster_groups,
- EMPATHY_ROSTER_VIEW_GROUP_TOP_GROUP);
+ EMPATHY_ROSTER_MODEL_GROUP_TOP_GROUP);
if (group == NULL)
{
to_add = g_list_copy (tops);
}
for (l = to_add; l != NULL; l = g_list_next (l))
- add_to_group (self, l->data, EMPATHY_ROSTER_VIEW_GROUP_TOP_GROUP);
+ add_to_group (self, l->data, EMPATHY_ROSTER_MODEL_GROUP_TOP_GROUP);
for (l = to_remove; l != NULL; l = g_list_next (l))
- remove_from_group (self, l->data, EMPATHY_ROSTER_VIEW_GROUP_TOP_GROUP);
+ remove_from_group (self, l->data, EMPATHY_ROSTER_MODEL_GROUP_TOP_GROUP);
g_list_free (to_add);
g_list_free (to_remove);
if (self->priv->show_groups)
{
if (favourite)
- add_to_group (self, individual, EMPATHY_ROSTER_VIEW_GROUP_TOP_GROUP);
+ add_to_group (self, individual, EMPATHY_ROSTER_MODEL_GROUP_TOP_GROUP);
else
remove_from_group (self, individual,
- EMPATHY_ROSTER_VIEW_GROUP_TOP_GROUP);
+ EMPATHY_ROSTER_MODEL_GROUP_TOP_GROUP);
}
else
{