[Xfce4-commits] [xfce/thunar] 01/02: Use display_name instead of basename to display filenames (bug #13532)

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

a   l   e   x       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/thunar.

commit 1effad95674fe282a99382b4348451c83ae40dff
Author: Gulevich A.I <otto_july at mail.ru>
Date:   Sun Mar 4 00:21:22 2018 +0100

    Use display_name instead of basename to display filenames (bug #13532)
---
 thunar/thunar-list-model.c | 2 +-
 thunar/thunar-path-entry.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/thunar/thunar-list-model.c b/thunar/thunar-list-model.c
index 825b514..6e40884 100644
--- a/thunar/thunar-list-model.c
+++ b/thunar/thunar-list-model.c
@@ -780,7 +780,7 @@ thunar_list_model_get_value (GtkTreeModel *model,
 
     case THUNAR_COLUMN_FILE_NAME:
       g_value_init (value, G_TYPE_STRING);
-      g_value_set_static_string (value, thunar_file_get_basename (file));
+      g_value_set_static_string (value, thunar_file_get_display_name (file));
       break;
 
     default:
diff --git a/thunar/thunar-path-entry.c b/thunar/thunar-path-entry.c
index 56780f0..e4a9cc8 100644
--- a/thunar/thunar-path-entry.c
+++ b/thunar/thunar-path-entry.c
@@ -1209,6 +1209,11 @@ thunar_path_entry_set_current_file (ThunarPathEntry *path_entry,
           g_free (text);
           text = tmp;
         }
+
+      // convert filename into valid UTF-8 string for display
+      tmp = text;
+      text = g_filename_display_name(tmp);
+      g_free (tmp);
     }
 
   if (is_uri)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.