aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-03-10 00:01:47 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2010-03-15 16:28:42 +0800
commita1aabfa9396be10ba988a84d3e7aac0ec6f10ffa (patch)
tree1df291c4b2d4c6935cb16b814875ee483bc40413
parent28202c4333c27f360d9298427a9f196954cf8f9f (diff)
downloadgsoc2013-empathy-a1aabfa9396be10ba988a84d3e7aac0ec6f10ffa.tar.gz
gsoc2013-empathy-a1aabfa9396be10ba988a84d3e7aac0ec6f10ffa.tar.zst
gsoc2013-empathy-a1aabfa9396be10ba988a84d3e7aac0ec6f10ffa.zip
stop displaying favorite contacts on top of groups
They are already displayed in a separated group on top of the contact list
-rw-r--r--libempathy-gtk/empathy-contact-list-store.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/libempathy-gtk/empathy-contact-list-store.c b/libempathy-gtk/empathy-contact-list-store.c
index 223d430ef..26ff11cd2 100644
--- a/libempathy-gtk/empathy-contact-list-store.c
+++ b/libempathy-gtk/empathy-contact-list-store.c
@@ -1554,8 +1554,6 @@ contact_list_store_get_group (EmpathyContactListStore *store,
static gint
compare_separator_and_groups (gboolean is_separator_a,
gboolean is_separator_b,
- gboolean is_favourite_a,
- gboolean is_favourite_b,
const gchar *name_a,
const gchar *name_b,
EmpathyContact *contact_a,
@@ -1570,13 +1568,8 @@ compare_separator_and_groups (gboolean is_separator_a,
}
}
- /* Favorites are displayed first */
- if (is_favourite_a && !is_favourite_b) {
- return -1;
- } else if (!is_favourite_a && is_favourite_b) {
- return 1;
/* One group and one contact */
- } else if (!contact_a && contact_b) {
+ if (!contact_a && contact_b) {
return 1;
} else if (contact_a && !contact_b) {
return -1;
@@ -1625,7 +1618,7 @@ contact_list_store_state_sort_func (GtkTreeModel *model,
-1);
ret_val = compare_separator_and_groups (is_separator_a, is_separator_b,
- is_favourite_a, is_favourite_b, name_a, name_b, contact_a, contact_b);
+ name_a, name_b, contact_a, contact_b);
if (ret_val != 0) {
goto free_and_out;
@@ -1684,7 +1677,7 @@ contact_list_store_name_sort_func (GtkTreeModel *model,
-1);
ret_val = compare_separator_and_groups (is_separator_a, is_separator_b,
- is_favourite_a, is_favourite_b, name_a, name_b, contact_a, contact_b);
+ name_a, name_b, contact_a, contact_b);
if (ret_val == 0)
ret_val = g_utf8_collate (name_a, name_b);