Merge lp:~junrrein/pantheon-files/fix-1009208 into lp:~elementary-apps/pantheon-files/trunk

[Julián Unrrein]

[Sidebar] Convert item names to UTF-8 to fix bug #1009208.

[Sidebar] Convert item names to UTF-8 to fix bug #1009208.

I just implemented what Victor said here -> https://bugs.launchpad.net/pantheon-files/+bug/1009208/comments/5.

I can't test if this works or not, as the problem isn't present in my machine.

=== modified file 'src/marlin-places-sidebar.c'
--- src/marlin-places-sidebar.c	2013-06-20 20:11:39 +0000
+++ src/marlin-places-sidebar.c	2013-06-27 01:54:25 +0000
@@ -187,10 +187,17 @@
         eject = NULL;
     }
 
+    GError* error = NULL;
+    gchar* converted_name = g_locale_to_utf8 (name, -1, NULL, NULL, &error);
+    if (error != NULL) {
+        g_warning ("Couldn't convert the bookmark name: %s With error: %s", name, error->message);
+        converted_name = name;
+    }
+
     gtk_tree_store_append (MARLIN_ABSTRACT_SIDEBAR(sidebar)->store, &iter, parent);
     gtk_tree_store_set (MARLIN_ABSTRACT_SIDEBAR(sidebar)->store, &iter,
                         PLACES_SIDEBAR_COLUMN_ICON, pixbuf,
-                        PLACES_SIDEBAR_COLUMN_NAME, name,
+                        PLACES_SIDEBAR_COLUMN_NAME, converted_name,
                         PLACES_SIDEBAR_COLUMN_URI, uri,
                         PLACES_SIDEBAR_COLUMN_DRIVE, drive,
                         PLACES_SIDEBAR_COLUMN_VOLUME, volume,