From 87ba373882f475f02a524a120b59ea9fcccf14e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 20 Nov 2023 18:25:30 +0100 Subject: New upstream version 0.32.3 --- src/folders/FoldersBranch.vala | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/folders') diff --git a/src/folders/FoldersBranch.vala b/src/folders/FoldersBranch.vala index 5de7082..49b2d97 100644 --- a/src/folders/FoldersBranch.vala +++ b/src/folders/FoldersBranch.vala @@ -168,11 +168,15 @@ public class Folders.SidebarEntry : Sidebar.SimplePageEntry, Sidebar.ExpandableE public SidebarEntry(File dir) { this.dir = dir; - collation = dir.get_path().collate_key_for_filename(); + collation = to_string().collate_key_for_filename(); } public override string get_sidebar_name() { - return dir.get_basename(); + try { + return dir.query_info(FileAttribute.STANDARD_DISPLAY_NAME, FileQueryInfoFlags.NONE, null).get_display_name(); + } catch (Error err) { + return this.to_string(); + } } public override string? get_sidebar_icon() { @@ -180,7 +184,7 @@ public class Folders.SidebarEntry : Sidebar.SimplePageEntry, Sidebar.ExpandableE } public override string to_string() { - return dir.get_path(); + return Filename.display_name(dir.get_path()); } public bool expand_on_select() { -- cgit v1.2.3