From 16cdf44ebbe9b69336b47932c222066a7e97743f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 7 Nov 2008 16:37:32 +0100 Subject: mpdclient: use g_utf8_collate() Use one g_utf8_collate() call instead of g_utf8_collate_key() twice plus strcmp(). --- src/mpdclient.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/mpdclient.c b/src/mpdclient.c index 3da280cef..b5e953a90 100644 --- a/src/mpdclient.c +++ b/src/mpdclient.c @@ -47,7 +47,6 @@ compare_filelistentry_dir(gconstpointer filelist_entry1, gconstpointer filelist_entry2) { const mpd_InfoEntity *e1, *e2; - char *key1, *key2; int n = 0; e1 = ((const filelist_entry_t *)filelist_entry1)->entity; @@ -55,13 +54,9 @@ compare_filelistentry_dir(gconstpointer filelist_entry1, if (e1 && e2 && e1->type == MPD_INFO_ENTITY_TYPE_DIRECTORY && - e2->type == MPD_INFO_ENTITY_TYPE_DIRECTORY) { - key1 = g_utf8_collate_key(e1->info.directory->path,-1); - key2 = g_utf8_collate_key(e2->info.directory->path,-1); - n = strcmp(key1,key2); - g_free(key1); - g_free(key2); - } + e2->type == MPD_INFO_ENTITY_TYPE_DIRECTORY) + n = g_utf8_collate(e1->info.directory->path, + e2->info.directory->path); return n; } -- cgit v1.2.3