From 5d5cc789d87ef57aef2bf41ccfd14f246717efa4 Mon Sep 17 00:00:00 2001 From: Simeon Krastnikov Date: Sun, 14 Jul 2019 21:15:33 -0400 Subject: [PATCH] Use natural order for sorting in directory menu --- plugins/directorymenu/directorymenu.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/plugins/directorymenu/directorymenu.c b/plugins/directorymenu/directorymenu.c index cb918be8..378c601b 100644 --- a/plugins/directorymenu/directorymenu.c +++ b/plugins/directorymenu/directorymenu.c @@ -527,6 +527,7 @@ directory_menu_plugin_menu_sort (gconstpointer a, GFileType type_a = g_file_info_get_file_type (G_FILE_INFO (a)); GFileType type_b = g_file_info_get_file_type (G_FILE_INFO (b)); gboolean hidden_a, hidden_b; + const gchar *display_name_a, *display_name_b; if (type_a != type_b) { @@ -544,8 +545,11 @@ directory_menu_plugin_menu_sort (gconstpointer a, if (hidden_a != hidden_b) return hidden_a ? -1 : 1; - return g_utf8_collate (g_file_info_get_display_name (G_FILE_INFO (a)), - g_file_info_get_display_name (G_FILE_INFO (b))); + display_name_a = g_file_info_get_display_name (G_FILE_INFO (a)); + display_name_b = g_file_info_get_display_name (G_FILE_INFO (b)); + + return strcmp (g_utf8_collate_key_for_filename (display_name_a, -1), + g_utf8_collate_key_for_filename (display_name_b, -1)); } -- 2.20.1