Pick the right sort function early

[empathy.git] / libempathy-gtk / empathy-contact-list-store.c

diff --git a/libempathy-gtk/empathy-contact-list-store.c b/libempathy-gtk/empathy-contact-list-store.c
index 8916761d43fb16368d4e1672980202b3675fecff..98cd81b5dc3e3000ca836e57ae9f8679a327cdca 100644 (file)
--- a/libempathy-gtk/empathy-contact-list-store.c
+++ b/libempathy-gtk/empathy-contact-list-store.c
@@ -1691,10 +1691,10 @@ contact_list_store_name_sort_func (GtkTreeModel *model,
                            EMPATHY_CONTACT_LIST_STORE_COL_IS_FAKE_GROUP, &fake_group_b,
                            -1);
 
-       ret_val = compare_separator_and_groups (is_separator_a, is_separator_b,
-               name_a, name_b, contact_a, contact_b, fake_group_a, fake_group_b);
-
-       if (ret_val == 0)
+       if (contact_a == NULL || contact_b == NULL)
+               ret_val = compare_separator_and_groups (is_separator_a, is_separator_b,
+                       name_a, name_b, contact_a, contact_b, fake_group_a, fake_group_b);
+       else
                ret_val = contact_list_store_contact_sort (contact_a, contact_b);
 
        if (contact_a) {