aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-11-03 19:37:16 -05:00
Code

Sort contacts on /who output

Browse Source
This commit is contained in:
James Booth 2013-05-30 21:47:30 +01:00
parent ae350dc5fb
commit 1ca2147844
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/xmpp/roster.c
View File

@ -68,6 +68,7 @@ static void _replace_name(const char * const current_name,
GSList * _get_groups_from_item(xmpp_stanza_t *item); GSList * _get_groups_from_item(xmpp_stanza_t *item);
static gboolean _key_equals(void *key1, void *key2); static gboolean _key_equals(void *key1, void *key2);
static gboolean _datetimes_equal(GDateTime *dt1, GDateTime *dt2); static gboolean _datetimes_equal(GDateTime *dt1, GDateTime *dt2);
static gint _compare_contacts(PContact a, PContact b);
void void
roster_add_handlers(void) roster_add_handlers(void)
@ -288,7 +289,7 @@ roster_get_contacts(void)
g_hash_table_iter_init(&iter, contacts); g_hash_table_iter_init(&iter, contacts);
while (g_hash_table_iter_next(&iter, &key, &value)) { while (g_hash_table_iter_next(&iter, &key, &value)) {
result = g_slist_append(result, value); result = g_slist_insert_sorted(result, value, (GCompareFunc)_compare_contacts);
} }
// resturn all contact structs // resturn all contact structs
@ -494,6 +495,34 @@ gboolean _key_equals(void *key1, void *key2)
return (g_strcmp0(str1, str2) == 0); return (g_strcmp0(str1, str2) == 0);
} }
static
gint _compare_contacts(PContact a, PContact b)
{
const char * utf8_str_a = NULL;
const char * utf8_str_b = NULL;
if (p_contact_name(a) != NULL) {
utf8_str_a = p_contact_name(a);
} else {
utf8_str_a = p_contact_barejid(a);
}
if (p_contact_name(b) != NULL) {
utf8_str_b = p_contact_name(b);
} else {
utf8_str_b = p_contact_barejid(b);
}
gchar *key_a = g_utf8_collate_key(utf8_str_a, -1);
gchar *key_b = g_utf8_collate_key(utf8_str_b, -1);
gint result = g_strcmp0(key_a, key_b);
g_free(key_a);
g_free(key_b);
return result;
}
static gboolean static gboolean
_datetimes_equal(GDateTime *dt1, GDateTime *dt2) _datetimes_equal(GDateTime *dt1, GDateTime *dt2)
{ {