Merge lp:~jeremywootten/pantheon-files/fix-network-mount-sidebar-item-path into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Use root location instead of default location as target for mounted device and network mount sidebar items

This branch uses the root location instead of the default location for the target of sidebar items for both mounted devices and network locations. The default location is sometimes the root location and sometimes the users home directory on the mount, which could cause confusion.

Different filemanagers behave differently in this respect; Thunar uses the root location but Nautilus uses the default location. So input from the UX team is required to decide what is the desired behaviour in elementaryos.

[Kirill Romanov (djaler1)]

It works

review: Approve (test)

=== modified file 'src/View/Sidebar.vala'
--- src/View/Sidebar.vala	2016-12-31 19:42:09 +0000
+++ src/View/Sidebar.vala	2017-02-28 15:17:59 +0000
@@ -602,7 +602,7 @@
 
                 var mount = volume.get_mount ();
                 if (mount != null) {
-                    root = mount.get_default_location ();
+                    root = mount.get_root ();
                     last_iter = add_place (Marlin.PlaceType.MOUNTED_VOLUME,
                                            iter,
                                            mount.get_name (),
@@ -641,7 +641,7 @@
                 if (volume != null)
                     continue;
 
-                root = mount.get_default_location ();
+                root = mount.get_root ();
                 if (root.is_native ()) {
                     string scheme = root.get_uri_scheme ();
                     if (scheme == "archive" ) {
@@ -678,7 +678,7 @@
             /* Add network mounts */
             network_mounts.reverse ();
             foreach (Mount mount in network_mounts) {
-                root = mount.get_default_location ();
+                root = mount.get_root ();
                 /* get_smb_share_from_uri will return the uri unaltered if does not have
                  * the smb scheme so we need not test.  This is required because the mount
                  * does not return the true root location of the share but the location used
@@ -749,7 +749,7 @@
                 var mount = volume.get_mount ();
                 if (mount != null) {
                     /* show mounted volume in sidebar */
-                    var root = mount.get_default_location ();
+                    var root = mount.get_root ();
                     last_iter = add_place (Marlin.PlaceType.MOUNTED_VOLUME,
                                            iter,
                                            mount.get_name (),
@@ -1312,7 +1312,7 @@
                     volume.mount.end (res);
                     Mount mount = volume.get_mount ();
                     if (mount != null) {
-                        var location = mount.get_default_location ();
+                        var location = mount.get_root ();
                         if (flags == Marlin.OpenFlag.NEW_WINDOW) {
                             var app = Marlin.Application.get ();
                             app.create_window (location);