[tracker/tracker-0.8] Fixes GB#616540: Add missing conversion to UTF-8 for directory names

[Martyn James Russell <mr src gnome org>]

commit bc607709308b8605eaef60aad6cd6ebfe78102c1
Author: Frederic Crozat <fcrozat mandriva com>
Date:   Fri May 21 11:08:04 2010 +0200

    Fixes GB#616540: Add missing conversion to UTF-8 for directory names

 src/tracker-preferences/tracker-preferences.vala |    8 +++++++-
 src/tracker-search-tool/tracker-metadata-tile.gs |    9 +++++----
 2 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/src/tracker-preferences/tracker-preferences.vala b/src/tracker-preferences/tracker-preferences.vala
index 3921f27..6ad764c 100644
--- a/src/tracker-preferences/tracker-preferences.vala
+++ b/src/tracker-preferences/tracker-preferences.vala
@@ -322,7 +322,13 @@ fill_in_model (ListStore model, SList<string> list)
 {
 	int position = 0;
 	foreach (string str in list) {
-		model.insert_with_values (null, position++, 0, str);
+		model.insert_with_values (null,
+		                          position++,
+		                          0,
+		                          Filename.to_utf8 (str,
+		                                            -1,
+		                                            null,
+		                                            null));
 	}
 }
 
diff --git a/src/tracker-search-tool/tracker-metadata-tile.gs b/src/tracker-search-tool/tracker-metadata-tile.gs
index 838e2a3..ee80832 100644
--- a/src/tracker-search-tool/tracker-metadata-tile.gs
+++ b/src/tracker-search-tool/tracker-metadata-tile.gs
@@ -272,13 +272,11 @@ class TrackerMetadataTile : EventBox
     
     def private DisplayFileDetails (uri : string, mime : string)
         var file = File.new_for_uri (uri)
-        var filepath = file.get_basename ()
         var displaypath = file.get_parent ()
         
         name_link.uri = uri
-        name_link.label = filepath
         path_link.uri = displaypath.get_uri ()
-        path_link.label = displaypath.get_path ()
+        path_link.label = displaypath.get_parse_name ()
 
         link_label : Label
         link_label = (Label) path_link.get_child ()
@@ -290,10 +288,11 @@ class TrackerMetadataTile : EventBox
         SetLabelValue (info_value1, mime)
 
         try
-            var info =  file.query_info ("standard::size,time::modified", \
+            var info =  file.query_info ("standard::size,time::modified,standard::display-name", \
                                          FileQueryInfoFlags.NONE, null)
 
             SetLabelSizeValue (info_value2, info.get_size())
+            name_link.label = info.get_display_name ()
 
             tm : TimeVal
             info.get_modification_time (out tm)
@@ -303,6 +302,8 @@ class TrackerMetadataTile : EventBox
             info_value3.set_markup (val3)
 
         except e:Error
+            var filepath = file.get_basename ()
+            name_link.label = filepath
             print "Could not get file info for %s", uri