Merge lp:~donadigo/pantheon-files/fix-1593748-navigation-items-path into lp:~elementary-apps/pantheon-files/trunk

[Adam Bieńkowski]

* Fix #1593748: "Navigation button items begin with 'file://'".

Fixes #1593748: "Navigation button items begin with 'file://'".

Instead of using GLib method, use the Files one to display correct path to the file, not URI.

[Jeremy Wootten (jeremywootten)]

Works fine, thanks.

review: Approve

=== modified file 'libwidgets/Chrome/TopMenu.vala'
--- libwidgets/Chrome/TopMenu.vala	2016-02-11 11:12:03 +0000
+++ libwidgets/Chrome/TopMenu.vala	2016-06-17 14:42:20 +0000
@@ -118,7 +118,7 @@
                                * in the closure, resulting in a value of n which would always be n=1. So
                                * by introducting a new variable I can bypass this anoyance.
                                */
-                var item = new Gtk.MenuItem.with_label (GLib.Uri.unescape_string (path));
+                var item = new Gtk.MenuItem.with_label (PF.FileUtils.sanitize_path (path));
                 item.activate.connect (() => {
                     back(cn);
                 });
@@ -135,7 +135,7 @@
             var n = 1;
             foreach (string path in path_list) {
                 int cn = n++; /* For explanation look up */
-                var item = new Gtk.MenuItem.with_label (GLib.Uri.unescape_string (path));
+                var item = new Gtk.MenuItem.with_label (PF.FileUtils.sanitize_path (path));
                 item.activate.connect (() => {
                     forward (cn);
                 });