Merge lp:~jeremywootten/pantheon-files/fix-network-browsing into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

Fix several issues affecting use of Samba shares.

This branch fixes several issues preventing basic use Files for network files and folders using the smb protocol. It is not intended to fix any other protocol,

TO TEST:
Testing of network browsing branch.

Create public and a password-protected shares with read/write access on a Samba server (preferably other than the test machine).

 Open Entire Network then HOME: The Samba shares and Windows Network are displayed.
Navigate to the public share. A new entry in the sidebar (under Devices) appears with an eject icon.

Create a folder in the share. Rename the folder. Bookmark the folder by drag/drop onto the sidebar. Navigate away from the network using the sidebar. Click on the bookmarked network folder. Folder opens in view.

Navigate away from the network. Eject the public share using the sidebar. Click on the bookmarked network folder - the share remounts and the folder opens.

Select the bookmarked folder and delete it by pressing "Delete" or using the context menu (the "Trash" option is replaced by "Delete pernanently"). Click on the bookmark - the "folder does not exist" view is shown; the option to create the folder functions as expected.

Create a new file in the public share. Drag and drop it onto the new folder. The file is copied into the folder (This is because the Gdk suggested action in this situation is Gdk.DragAction.COPY). To move the file into the folder, drag while holding down the Shift key. To get a choice menu, drag using the secondary (right) button (The option to link is not supported on smb).

Bookmark a file in a samba share folder, using the context menu. Bookmark appears in sidebar. Navigate away from the folder. Click the bookmark. Folder opens in view with file selected.
Open a new window and navigate to a folder containing movable files. Drag and drop files and folders between this window and the public share.

Navigate to the password protected share - a dialog requesting entry of the password appears. On entry of the correct password the share is mounted and opens. File creation, renaming, bookmarking and drag/drop should work as for the public share.

Password can be remembered by selecting the required option in the dialog.
A bookmark to a folder on password protected shared folder will bring up the password dialog if the password has not been remembered. This does not work properly with bookmarked files on password protected shares and will fixed if possible in a different branch.

Type "network://" or "network:///" into pathbar - the Entire Network view opens.

Type "smb://" or "smb:///" into pathbar. Samba root location loads.

Type "smb://workgroup" into pathbar. Windows workgroup folder opens.

Set the "restore-tabs" preference to true. Navigate to a public smb share location and close the application. Re-open to application - the smb shared folder loads. Close the application. Log out of the smb share using a different app or otherwise. Re-open FIles - the smb share is remounted and the folder displayed.

Set the "restore-tabs" preference to true. Navigate to a password protected smb share location without saving the password, and close the application. Re-open to application - folder is displayed. Close the application. Log out of the smb share using a different app or otherwise. Re-open Files - the password dialog shows.

Navigation history buttons work as expected when history includes network folders.

Pathbar work as expected, except that network default locations and shares are displayed like folders (with corresponding breadcrumbs) but right clicking on the corresponding breadcrumb does not bring up a context menu as they are not true folders.

Right clicking on network default locations and shares in view brings up a truncated context menu showing only applicable actions (except that plugins may show unapplicable actions)

[PerfectCarl (name-is-carl)]

Here are my remarks.

1) when files starts displaying network (because it was the last folder opened in the last session) it slows down the startup even if no network can be found
  Also it logs the following in the console:
[_LOG_LEVEL_WARN 13:55:55.176021] Couldn't connect to accessibility bus: Failed to connect to socket /tmp/dbus-c9DXGlcvF5: Connection refused

2) When I double click on Windows Network with no server, this is written to the console:
[_LOG_LEVEL_FATAL 14:03:35.490005] [GLib-GIO] g_file_info_get_attribute_string: assertion 'G_IS_FILE_INFO (info)' failed
[_LOG_LEVEL_FATAL 14:03:35.490060] Files will not function properly.
[_LOG_LEVEL_WARN 14:03:38.563686] gof-directory-async.vala:99: mount_mountable failed: Failed to retrieve share list from server: No such file or directory
[_LOG_LEVEL_WARN 14:03:38.579646] ZeitgeistManager.vala:15: Fetching file info folder loggin to zeitgeist failed: The specified location is not mounted
[_LOG_LEVEL_FATAL 14:03:38.692921] [GLib-GIO] g_file_info_get_attribute_string: assertion 'G_IS_FILE_INFO (info)' failed
[_LOG_LEVEL_FATAL 14:03:38.693035] Files will not function properly.
[_LOG_LEVEL_WARN 14:03:38.715301] ZeitgeistManager.vala:15: Fetching file info folder loggin to zeitgeist failed: The specified location is not mounted
[_LOG_LEVEL_WARN 14:03:38.716851] ZeitgeistManager.vala:15: Fetching file info folder loggin to zeitgeist failed: The specified location is not mounted
[_LOG_LEVEL_FATAL 14:03:47.079300] [GLib-GIO] g_file_info_get_attribute_string: assertion 'G_IS_FILE_INFO (info)' failed
[_LOG_LEVEL_FATAL 14:03:47.079349] Files will not function properly.

3) The size of Windows Network is 0 bytes when there is no sever. Shouldn't it be left blank or named "0 server"?
http://i.imgur.com/zXgD1Fn.png

[PerfectCarl (name-is-carl)]

4) The "Windows network" has a property windows that let the user change the permission (chmod) of the item. Is this really useful/taken into account?

5) The right click menu of "Windows network" shows a "open in terminal" that does nothing (the terminal app is opened though)

6) The error message is not very helpful "invalid argument is very vague"
http://i.imgur.com/9BX6AAE.png

7) Put sample text in the field to help the user to fill out the form. At the moment empty fields are not very helpful.
http://i.imgur.com/SVMLJ3g.png
I would recommend :
  - server: 12.34.56.78
  - folder: nothing
  - Domain name: WORKGROUP

8) The port field must be hidden if it can't be used

9) I have a samba server on my local network but I haven't configured it in Files. Viewing the "Windows server" causes the application to be irresponsive.
The console displays this:
[_LOG_LEVEL_FATAL 14:33:06.441194] [GLib-GIO] g_file_info_get_attribute_string: assertion 'G_IS_FILE_INFO (info)' failed
[_LOG_LEVEL_FATAL 14:33:06.441324] Files will not function properly.
[_LOG_LEVEL_FATAL 14:33:12.247325] [GLib-GIO] g_app_info_get_all_for_type: assertion 'content_type != NULL' failed
[_LOG_LEVEL_FATAL 14:33:12.247420] Files will not function properly.
[_LOG_LEVEL_WARN 14:33:12.255183] plugin.vala:96: GDBus.Error:org.elementary.ContractorError.NoMimetypesGiven: No mimetypes were provided.
[_LOG_LEVEL_FATAL 14:33:14.680825] [GLib-GIO] g_file_info_get_attribute_string: assertion 'G_IS_FILE_INFO (info)' failed
[_LOG_LEVEL_FATAL 14:33:14.680882] Files will not function properly.
[_LOG_LEVEL_WARN 14:33:48.733310] ZeitgeistManager.vala:15: Fetching file info folder loggin to zeitgeist failed: The specified location is not mounted
[_LOG_LEVEL_WARN 14:34:07.293536] ZeitgeistManager.vala:15: Fetching file info folder loggin to zeitgeist failed: The specified location is not mounted
[_LOG_LEVEL_WARN 14:34:07.293807] ZeitgeistManager.vala:15: Fetching file info folder loggin to zeitgeist failed: The specified location is not mounted

After some time, files displays "network://smb:0/" which is empty
Going from a tab displaying local data to "network://smb:0/" is also slow.

10) Failing to connect to the server because of invalid details give one error message "Failed to mount Windows share". If I click to "continue" without changing anything, I get another message "Please verify your user details"
http://i.imgur.com/2sopzoJ.png
http://i.imgur.com/y16DOEH.png
   Note that the button label is changing. Not sure that this is a good idea

[PerfectCarl (name-is-carl)]

10) there is no way to edit the smb details once the share is mounted

11) once the share is mounted, it does not appear in the "Windows Network"

12) I have the following warnings in the console
[_LOG_LEVEL_WARN 14:49:50.850173] gof-directory-async.vala:193: directory monitor failed: Operation not supported by backend smb://192.168.0.10/sdcard/
[_LOG_LEVEL_WARN 14:49:55.875373] gof-directory-async.vala:193: directory monitor failed: Operation not supported by backend smb://192.168.0.10/sdcard/Download

13) For some reason, some folders can't be listed randomly: all I see is the spinning wheel. That error pops up randomly.
   Note: I'm using "Samba Filesharing for Android" as a samba server

[PerfectCarl (name-is-carl)]

14) the servers are not remembered in the "Windows network" meaning that I have to enter the details to the server every time

15) the local discovery doesn't work: my samba server that sits on my local network is not discovered

16) when I bookmark the "Windows network" and click on the newly created bookmark it says that folder does not exist (the path bar is "network://Windows Network/")

[Jeremy Wootten (jeremywootten)]

Thanks for the comprehensive review, Carl. I think the scope of this branch will have to be restricted to very basic network browsing (essentially the 4 linked bugs and no regressions although the branch does start address some other issues).

I know there are a lot of other issues around the network browsing - some of which I don't know how to fix at the moment. I suspect some separate bugs with a decent bounty on will be required ...

I'll go through your review in detail and fix what I can.

[Jeremy Wootten (jeremywootten)]

Initial responses to Carl's review:
1) Should we not restore network folders?
2) The "fatal" errors are not really fatal. I'll see if I can quiet them. Do we need a message in the user interface?
3) This is outside the scope of the branch -and also happens on other File Managers (Thunar, Nautilus). Do we need "Properties" dialog for network locations?
4) Do we need "Properties" dialog for network locations?
5) Will not show "Open in Terminal" for network locations.
6) and 7) and 8) Server connection dialog is outside scope of branch
9) Could you give more explanation? I am not sure what steps you carried out.
10a) This is an issue with the connect to server dialog - outside scope of branch.
10b) Could you give more explanation? I am not sure what steps you carried out.
11) Could you give more explanation? Do you mean it doesn't appear in sidebar (in the right place)?
12) Warnings are due to failed attempt to connect a FileMonitor to a network folder that does not support it. It is expected to fail under these circumstances, so the warning is not really required. I'll change to debug.
13) This needs investigating - if you can identify which circumstances cause it please let me know. I'll try to reproduce. I think I saw it in earlier versions of the branch but not recently.
14) Do you mean servers are not remembered in the "Connect to Server" dialog? This is outside the scope of the branch
15) This suddenly stopped working for me too, seemingly after connecting a Windows machine to the network. But it was the same with Thunar and Nautilus. Fixed it by changing the name resolve order in etc/samba/samb.conf [global] section to "name resolve order = bcast host lmhosts wins". It appears to be a quirk/bug in Samba itself.
16) Confirmed. This is because "Windows Network" is not a real folder but the location bar thinks it is. I'll inhibit bookmarking of pseudo folders for now.

[PerfectCarl (name-is-carl)]

I totally agree with you about keeping the scope tight.

I did report everything that I noticed so I can have your opinion about "bug" or "out of scope".
Not that I have your feedback, I filed the following reports.

3) This is outside the scope of the branch -and also happens on other File Managers (Thunar, Nautilus). Do we need "Properties" dialog for network locations?
-> https://bugs.launchpad.net/pantheon-files/+bug/1400731

6) and 7) and 8) Server connection dialog is outside scope of branch
-> https://bugs.launchpad.net/pantheon-files/+bug/1400735
-> https://bugs.launchpad.net/pantheon-files/+bug/1400738
-> https://bugs.launchpad.net/pantheon-files/+bug/1400740

14) Do you mean servers are not remembered in the "Connect to Server" dialog? This is outside the scope of the branch
-> https://bugs.launchpad.net/pantheon-files/+bug/1400734

All those issues can be found there : https://bugs.launchpad.net/pantheon-files/+bugs?field.tag=networking
(two older issues are not mine)

[PerfectCarl (name-is-carl)]

1) Should we not restore network folders?
Well I don't know if the network folders should be restored mounted or un-mounted (I would vote for un-mounted though - as it is the case for other drives).

What ever the solution, restoring network folders must be done more asynchronously not to stop the UI thread.

4) Do we need "Properties" dialog for network locations?
Yes very much so.
One because those information are entered by the user. Not offering a way to edit them is akin to data loss to me (not a catastrophic one, I agree).
Second because once I'm connected to the server, there is no way to check what I'm connected to - or how. Suppose I don't remember which server (or user) I entered, I'm stuck.

Again I'm not sure that this is in the scope of this merge proposal but this is very important to make network folders actually usable.

[PerfectCarl (name-is-carl)]

A blueprint has been filed with suggestion to improve how Files handle network folders
https://blueprints.launchpad.net/pantheon-files/+spec/improve-network-folders

> 4)
See https://blueprints.launchpad.net/pantheon-files/+spec/remember-server-connections
and https://blueprints.launchpad.net/pantheon-files/+spec/files-ftp-bookmark

> 9) Could you give more explanation? I am not sure what steps you carried out.
Well I just set up a SAMBA server on my android phone and I thought I noticed that
Files were not as responsive.

I posited that it could have been due to some SAMBA discovery code that kicked in.
Of course, I might be very wrong.

> 10b) Could you give more explanation? I am not sure what steps you carried out.
Liked to 4) See my explanation in the comment right above

> 11) Could you give more explanation? Do you mean it doesn't appear in sidebar (in the right place)?
Well I would expect the "Windows network" to list all the all the servers that
are around the computer.
Isn't it the point of that item?

In my case, I just added a connection to a Windows server and the server isn't even
listed in that special "Windows network" folder.

Could you confirm me that this is out of scope?

[PerfectCarl (name-is-carl)]

>> 13) For some reason, some folders can't be listed randomly: all I see is the spinning wheel.
>> That error pops up randomly.
>> Note: I'm using "Samba Filesharing for Android" as a samba server
>
> 13) This needs investigating - if you can identify which circumstances cause it please let me
> know. I'll try to reproduce. I think I saw it in earlier versions of the branch but not recently.

For the time being I can't do anything because some time a folder can be listed. Some other time, the same folder can't be listed.

I can try to set up a a local folder that I would share via SAMBA and connect to it.
Maybe adding some debbuging trace could help me send you a useful report.

>> 15) the local discovery doesn't work: my samba server that sits
>> on my local network is not discovered
>
> 15) This suddenly stopped working for me too, seemingly after connecting a
> Windows machine to the network. But it was the same with Thunar and Nautilus. Fixed
> it by changing the name resolve order in etc/samba/samb.conf [global] section to "name
> resolve order = bcast host lmhosts wins". It appears to be a quirk/bug in Samba itself.

I may be very wrong but isn't something that must be handled one way or another? (either at the
distribution level, or by Files)

Note: the complete path is /etc/samba/smb.conf
My file doesn't have a "name resolver order" entry and has
# wins support = no
So I suppose that is equivalent to "wins support=yes"

[Jeremy Wootten (jeremywootten)]

9) There is certainly a certain delay involved in the discovery process, which will depend on your network setup, but I think this should only occur the first time the network is browsed. Display of network files may also be slower depending on the speed of the connection. The aim is that Files should at least be comparable to Nautilus in speed (but this may not yet always be so ...)
11) On my setup the "Windows Network" 'folder' contains one 'folder' "Workgroup" and this contains 'folders' for each of the Samba servers on the network (One Linux and one Windows). Within each of these are 'folders' for each of the shares on those servers. I am not sure why servers should be missing - unless one is configured not to broadcast its presence? The process of discovery of servers is handled outside Files. I can't think of anything in Files that would effect this.
15) I should have said that the line needs to be added to the [global] section. I agree this is not ideal, but fixing it is definitely outside the scope of this branch (and probably my expertise).

[PerfectCarl (name-is-carl)]

The smb.conf changes has been filed as lp:1401693

[Jeremy Wootten (jeremywootten)]

Re 4) You seem to be referring to the "Connect Server" dialog whereas I was referring to the "Properties Window" (the blueprints you mention are for the connect server dialog). I have suppressed the Properties Window for network locations that are not real files, as at the moment it gives limited and in some cases incorrect information. We need a new way of displaying (and remembering) network connection properties.

[Jeremy Wootten (jeremywootten)]

I can confirm that the delay in loading network views is significantly longer than before - and this is creating a bug in the column view where the new view is not filled unless you open it twice. I'll set this branch back to "In progress" while I try to address these issues.

[PerfectCarl (name-is-carl)]

20) the mount buttons are cut off in the side bar.
http://i.imgur.com/VKoQ5OT.png

21) the application displays the following warnings:
[_LOG_LEVEL_WARN 13:41:07.172015] gof-directory-async.vala:166: mount_mountable failed: Location is already mounted
[_LOG_LEVEL_WARN 13:41:07.827718] gof-directory-async.vala:166: mount_mountable failed: Location is already mounted
[_LOG_LEVEL_WARN 13:41:07.834263] The specified location is not mounted [code 16]
[_LOG_LEVEL_WARN 13:41:08.686950] gof-directory-async.vala:166: mount_mountable failed: Location is already mounted
[_LOG_LEVEL_WARN 13:41:09.826451] gof-directory-async.vala:166: mount_mountable failed: Location is already mounted
[_LOG_LEVEL_WARN 13:41:09.832415] The specified location is not mounted [code 16]
[_LOG_LEVEL_WARN 13:41:11.089177] The specified location is not mounted [code 16]

22) when browsing a samba server that doesn't exist, the right click menu displayed is the one for local folders. Along with the new options :)
http://imgur.com/sOtOYwF

[PerfectCarl (name-is-carl)]

23) My samba domain (WORKGROUP) and samba share are compressable.
http://imgur.com/EFadkb6

[PerfectCarl (name-is-carl)]

24) when I try to connect to a SAMBA folder that doesn't require a password as guest, the "connect to server" dialog shows me an error asking me for a password. When I try to click the connect button another time (without changing anything or inputting a password) it works

[PerfectCarl (name-is-carl)]

25) Files let me connect as a non existing user to public share (shared as guest)
I don't know if that's normal but this weird.

I try to connect to smb://WORKGROUP;ZZZZ@192.168.56.101/shared/
Files asks me for a password. I enter a bogus password for this account that doesn't exist and Files displays the folder.
Is it because the SAMBA share is public? Is it because I'm already connected to it via a another tab (see the multiple connections to the same folder in the sidebar)

http://i.imgur.com/OYheNHK.png

[PerfectCarl (name-is-carl)]

26) when I click on the "CRAN-virtualbox" (my SAMBA server) in Files it doesn't display the shares. On the other hand, when I click on Windows Network/CRAN-virtualbox/ the shares are displayed.

Once the shares got displayed once, I can click on SAMBA server

27) I cannot create a folder in a SAMBA share while I have read/write permission.
The folders are created on the server but not displayed by Files and the following error message is displayed:
[_LOG_LEVEL_WARN 14:08:36.609732] gof-directory-async.vala:166: mount_mountable failed: Location is already mounted
[_LOG_LEVEL_WARN 14:08:48.812230] AbstractDirectoryView.vala:790: You do not have permission to rename this file
[_LOG_LEVEL_WARN 14:09:03.537883] AbstractDirectoryView.vala:790: You do not have permission to rename this file

http://i.imgur.com/zujvoOo.png

When I refresh the folder (Ctrl+R) the folder are displayed (and I can rename them)

[PerfectCarl (name-is-carl)]

28) the first time I open a share that I can write in but that has no files or folder, the right click menu does not show any option to create files.

http://i.imgur.com/4cAOUBi.png

After I work in that folder, the right click menu gets updated.

[PerfectCarl (name-is-carl)]

29) When I drop a folder from a password protected SAMBA share to the bookmark side bar, the folder gets added. But when I unmount the share, the folder disappears from the sidebar.
When I re-mount the share the bookmark is not added

It works for public SAMBA share folder

Note: I can't do that with the SAMBA share. Only folder contained in the share. I wish I could.

[PerfectCarl (name-is-carl)]

About 29) it works now. I think there is a tricky case when it doesn't (also at some point the app segfaults but I cannot reproduce it)
Here is the console output:

[_LOG_LEVEL_FATAL 14:24:10.441835] [GLib-GIO] g_file_equal: assertion 'G_IS_FILE (file1)' failed
[_LOG_LEVEL_FATAL 14:24:10.441885] Files will not function properly.
[_LOG_LEVEL_FATAL 14:24:10.442026] [GLib-GIO] g_file_get_uri: assertion 'G_IS_FILE (file)' failed
[_LOG_LEVEL_FATAL 14:24:10.442070] Files will not function properly.
[_LOG_LEVEL_FATAL 14:24:10.442113] [GLib] g_string_append: assertion 'val != NULL' failed
[_LOG_LEVEL_FATAL 14:24:10.442141] Files will not function properly.
[_LOG_LEVEL_FATAL 14:24:10.443330] [GLib-GIO] g_file_is_native: assertion 'G_IS_FILE (file)' failed
[_LOG_LEVEL_FATAL 14:24:10.443364] Files will not function properly.
[_LOG_LEVEL_FATAL 14:24:10.443407] [GLib-GIO] g_file_get_uri: assertion 'G_IS_FILE (file)' failed
[_LOG_LEVEL_FATAL 14:24:10.443436] Files will not function properly.
[_LOG_LEVEL_FATAL 14:24:10.443476] [GLib-GIO] g_file_get_parse_name: assertion 'G_IS_FILE (file)' failed
[_LOG_LEVEL_FATAL 14:24:10.443504] Files will not function properly.
[_LOG_LEVEL_FATAL 14:24:10.443544] marlin_places_sidebar_real_add_place: assertion 'tooltip != NULL' failed
[_LOG_LEVEL_FATAL 14:24:10.443573] Files will not function properly.
[_LOG_LEVEL_FATAL 14:24:10.517906] [GLib-GIO] g_file_is_native: assertion 'G_IS_FILE (file)' failed
[_LOG_LEVEL_FATAL 14:24:10.518017] Files will not function properly.
[_LOG_LEVEL_FATAL 14:24:10.520824] [GLib-GIO] g_file_is_native: assertion 'G_IS_FILE (file)' failed
[_LOG_LEVEL_FATAL 14:24:10.520870] Files will not function properly.
[_LOG_LEVEL_FATAL 14:24:10.520908] [GLib-GIO] g_file_get_uri: assertion 'G_IS_FILE (file)' failed
[_LOG_LEVEL_FATAL 14:24:10.520932] Files will not function properly.
[_LOG_LEVEL_FATAL 14:24:10.520963] [GLib-GIO] g_file_get_parse_name: assertion 'G_IS_FILE (file)' failed
[_LOG_LEVEL_FATAL 14:24:10.520987] Files will not function properly.
[_LOG_LEVEL_FATAL 14:24:10.521017] marlin_places_sidebar_real_add_place: assertion 'tooltip != NULL' failed
[_LOG_LEVEL_FATAL 14:24:10.521043] Files will not function properly.
[_LOG_LEVEL_WARN 14:24:11.760355] gof-directory-async.vala:166: mount_mountable failed: Location is already mounted
Segmentation fault (core dumped)

[Jeremy Wootten (jeremywootten)]

Thanks again Carl for your thorough testing!

20) Mount button truncation also occurs in trunk and is a bug in the sidebar, so will need a separate bug report.
21) I will set the mount_mountable warnings to "debug" so that will not normally appear.
22, 23 & 28) I will try to improve the relevance of the context menus. Its a trickier with network locations. The appearance of inappropriate plugin/contractor entries like "Compress" may have to be dealt with in the plugins/contractors themselves.
24, 25) These are issues with connect server dialog and outside the scope of this branch - I suggest they are added to your networking blueprint. It appears that Samba lets you connect to a public share using any credentials. Each connection with a different set of credentials appears as another entry in the sidebar but you can only distinguish them by looking at the tooltip. I haven't investigated whether there are any problems having multiple connections like this.
26, 27, 28, 29) I can confirm these (except for the segfault) but haven't found the reason yet.

[Jeremy Wootten (jeremywootten)]

The latest revisions -

1) Silence non-critical mount_moutable warnings
2) Improve context menu relevance
3) Fix truncation of eject button
4) Less likely to fail to display servers and shares

The problems with bookmarking password protected samba shares and renaming files could not be reproduced. Please confirm still occurring in latest version.

[PerfectCarl (name-is-carl)]

Hello,

All in all, it feels more stable and faster.
Congratulations!

I haven't tested everything yet but here's my feedback

26, 27, 28 are fixed (nice!)

22 is fixed
23 I added an issue for contractor : https://bugs.launchpad.net/elementaryos/+bug/1405878

30) I still have the following critical warnings:
[_LOG_LEVEL_FATAL 23:16:12.363828] gof_file_is_mountable: assertion 'file->info != NULL' failed
[_LOG_LEVEL_FATAL 23:16:12.363878] Files will not function properly.

31) is it expected that the permission tab in the properties dialog is not shown for files in SAMBA share whether I have read/write permissions or not?

32) is it on purpose that I can't add a samba server (\\CRAN-VIRTUALBOX) or even a samba share (\\CRAN-VIRTUALBOX\share) but only a folder (\\CRAN-VIRTUALBOX\share\folder) to the bookmark?
I find adding at a samba share useful.

[Jeremy Wootten (jeremywootten)]

Thanks Carl. I need to fix the conflict with current trunk now and make sure there are no regressions.

You are supposed to be able to bookmark a share (using the context menu), but I now notice that this only works if you open the share and right click on the background. If you display the server and right-click on the "folder" representing the share then you only get the minimal menu. I'll try to fix this.

I don't think there is any technical reason why a bookmark to a server should not work but at the moment it is not implemented. I'll try it.

I have deliberately not addressed the properties dialog issues in this branch. The whole issue of getting meta data from network files needs addressing. This branch is targeted mainly at browsing - i.e. connecting to and navigating network locations.

[PerfectCarl (name-is-carl)]

> I have deliberately not addressed the properties dialog issues in this branch.
> The whole issue of getting meta data from network files needs addressing.
> This branch is targeted mainly at browsing - i.e. connecting to and navigating
> network locations.

Do you want me to file a general bug report for this?
Or is this already on your todo list?

[Jeremy Wootten (jeremywootten)]

There are these related bugs:

https://bugs.launchpad.net/pantheon-files/+bug/1386335
https://bugs.launchpad.net/pantheon-files/+bug/1400731

but a more general bug, or series of bugs, requesting a more general overhaul of the properties dialog shown when looking at network entities (including servers), tailored to the particular protocol in use, could be filed. I could then put a bounty on the ones requiring significant effort to try and attract some assistance.

[Jeremy Wootten (jeremywootten)]

The new revisions enable the bookmarking of network locations using the context menu and drag/drop.
Only mounted locations should be bookmarked.

[PerfectCarl (name-is-carl)]

# Test with a SMB share from a luna VM (samba = 2:3.6.3-2ubuntu2.11)

40) the first time I connect to the SMB domain, all the shares are displayed with a red cross.
What is the meaning of the cross?
http://i.imgur.com/EmDkwJw.png

41) Not sure if that's a bug or a feature but when two windows are opened to the same shared folder, any operation done to one window is not synchronized to the other one.
Unlike how it is done to local folders.
Please confirm that this is done on purpose.

(Unmounting the share refreshes both windows though - neat!)

42) when the mouse moves over the samba icon in the sidebar, there is a fuzzy effect on the icon
https://ele.slack.com/files/carl/F039M70J0/files-network-icons.webm
Is this intended?

43) when displaying the property dialog for a shared folder, the free/total space of the current local partition is displayed.
Either display the remote free/total space of the remote share (if available) or either hide the bar

44) question: shouldn't be the tab named 'private' instead of '/' ?
http://i.imgur.com/laMnyGh.png

45) Can't create an archive in a folder where I can create files in.
Not sure if file-roller is to blame here or Files, but that's annoying.
(Same error with Nautilus though so I would say file-roller)

46) Create a shortcut to a file present on a share folder in the sidebar.
Unmount the share.
Click on the shorcut: you will be said that the file doesn't exist.
If you click on the file one more time, the file will become available.

[PerfectCarl (name-is-carl)]

47) message displayed in the console with a typo:
PropertiesWindow.vala:270: selection sizr update

[Jeremy Wootten (jeremywootten)]

40) I've not seen this, but it looks like a fall-back emblem for the "locked" emblem you get on all unwritable or unreadable files. Are you using the default icon-theme?

[Jeremy Wootten (jeremywootten)]

41) This is a consequence of not being able to create a FileMonitor for remote folders. This is what alerts the other windows that something changed for local folders, either as a result of a Files action by another window or externally. Some kind of regular polling of the remote folders would have to be implemented for changes that were initiated outside of Files to be reflected in the Files windows, but it should be possible for internal actions to trigger an update of all Files windows. I'll look into it.

[Jeremy Wootten (jeremywootten)]

42) That appears to be due to the icon being changed to the PRELIT state by the TreeView, which is normal behaviour. The fact it appears fuzzy is presumably a theme design issue?

[Jeremy Wootten (jeremywootten)]

43) I am getting the correct information for the remote share displayed - which is a real remote machine. Could this be due to the fact you are running the share on a VM locally?

[Jeremy Wootten (jeremywootten)]

44) This is because "private" is treated as a share name rather than a folder, so you are displaying the root folder of the share. However, I agree from the users point of view it would be less confusing to name the tab with the share name in this situation.

[Jeremy Wootten (jeremywootten)]

45) Compression is offered through a contractor so this needs to be fixed (if possible) there. I think it outside the scope of this branch.

[Jeremy Wootten (jeremywootten)]

46) I cannot reproduce this either with public folder or a password protected one. Could be a timing issue? If you just click once, is the share (eventually) remounted (even though the view shows "does not exist"?

[Jeremy Wootten (jeremywootten)]

40) I am now getting the red crosses so it may be due to something merged from trunk. It is shown where the user has neither read nor write permissions. Read-only files are shown with a lock. So it looks like the permissions on the smb domain are not correctly determined. The properties window gives them as 000. As a short-term fix the emblems could be suppressed where permissions are 000.

46) I have reproduced this now - it happens for a file but not a folder. I'll try and fix.

[Jeremy Wootten (jeremywootten)]

40) Emblems no longer shown on remote files.

46) There is no simple fix for this so I have prevented bookmarking of files on remote locations. When a bookmark is clicked for a file on an unmounted location, there is no simple way of knowing whether it is pointing to a file or folder so it is assumed to be a folder.

[PerfectCarl (name-is-carl)]

50)

It seems that launching files with bookmark that are unmounted produces the following output

10) when I launch the app, I have the following output.

[_LOG_LEVEL_FATAL 22:00:42.019477] [GLib-GIO] g_file_info_get_attribute_string: assertion 'G_IS_FILE_INFO (info)' failed
[_LOG_LEVEL_FATAL 22:00:42.019547] Files will not function properly.
[_LOG_LEVEL_FATAL 22:00:42.020752] [GLib-GIO] g_file_info_get_attribute_string: assertion 'G_IS_FILE_INFO (info)' failed
[_LOG_LEVEL_FATAL 22:00:42.020802] Files will not function properly.
[_LOG_LEVEL_FATAL 22:00:42.020901] [GLib-GIO] g_file_info_get_attribute_string: assertion 'G_IS_FILE_INFO (info)' failed
[_LOG_LEVEL_FATAL 22:00:42.020930] Files will not function properly.

Here's the full stacktrace:

#0 g_logv (log_domain=0x7ffff5ab1198 "GLib-GIO", log_level=G_LOG_LEVEL_CRITICAL, format=<optimized out>,
    args=args@entry=0x7fffffffcf08) at /build/buildd/glib2.0-2.42.1/./glib/gmessages.c:1046
#1 0x00007ffff524ab32 in g_log (log_domain=log_domain@entry=0x7ffff5ab1198 "GLib-GIO",
    log_level=log_level@entry=G_LOG_LEVEL_CRITICAL, format=format@entry=0x7ffff529244d "%s: assertion '%s' failed")
    at /build/buildd/glib2.0-2.42.1/./glib/gmessages.c:1079
#2 0x00007ffff524ab59 in g_return_if_fail_warning (log_domain=log_domain@entry=0x7ffff5ab1198 "GLib-GIO",
    pretty_function=pretty_function@entry=0x7ffff5ab85c0 <__FUNCTION__.13927> "g_file_info_get_attribute_string",
    expression=expression@entry=0x7ffff5ab46df "G_IS_FILE_INFO (info)") at /build/buildd/glib2.0-2.42.1/./glib/gmessages.c:1088
#3 0x00007ffff5a086fc in g_file_info_get_attribute_string (info=0x0, attribute=0x7ffff7bcab49 "standard::target-uri")
    at /build/buildd/glib2.0-2.42.1/./gio/gfileinfo.c:887
#4 0x00007ffff7baf2d2 in gof_file_is_location_uri_default (file=0xc15e70)
    at /home/cran/Documents/Projects/elementary/pantheon-files/fix-crash-when-trashing/libcore/gof-file.c:201
#5 0x00007ffff7baf3ef in gof_file_is_root_network_folder (file=0xc15e70)
    at /home/cran/Documents/Projects/elementary/pantheon-files/fix-crash-when-trashing/libcore/gof-file.c:231
#6 0x00007ffff7baf359 in gof_file_is_remote_uri_scheme (file=0xc15e70)
    at /home/cran/Documents/Projects/elementary/pantheon-files/fix-crash-when-trashing/libcore/gof-file.c:218
#7 0x00007ffff7baf509 in gof_file_get_folder_icon_from_uri_or_path (file=0xc15e70)
    at /home/cran/Documents/Projects/elementary/pantheon-files/fix-crash-when-trashing/libcore/gof-file.c:257
#8 0x000000000042fa25 in marlin_bookmark_get_icon (self=self@entry=0xc174e0)
    at /home/cran/Documents/Projects/elementary/pantheon-files/fix-crash-when-trashing/src/Bookmark.vala:83
#9 0x000000000046e1a3 in marlin_places_sidebar_add_bookmark (index=7, bm=0xc174e0, iter=<synthetic pointer>, self=0x9fc520)
    at /home/cran/Documents/Projects/elementary/pantheon-files/fix-crash-when-trashing/src/View/Sidebar.vala:642
#10 marlin_places_sidebar_update_places (self=0x9fc520)
    at /home/cran/Documents/Projects/elementary/pantheon-files/fix-crash-when-trashing/src/View/Sidebar.vala:454
#11 0x00007ffff57761c8 in g_closure_invoke (closure=0xa08060, return_value=0x0, n_param_values=1, param_values=0x7fffffffd600,
...

[Jeremy Wootten (jeremywootten)]

Then main effects of the latest revisions are to stop thumbnailing remote files and to remove inappropriate context menu entries from workgroups.

[Danielle Foré (danrabbit)]

When attempting to merge trunk I get:
Text conflict in libcore/gof-directory-async.vala
Text conflict in libwidgets/LocationBar.vala
Text conflict in src/View/LocationBar.vala
3 conflicts encountered.

If we can get those conflicts solved, Cody and I would like to merge this within the next day or so

[Danielle Foré (danrabbit)]

Right click a breadcrumb in a local path > Open in New Tab > "Unable to mount folder"

[Danielle Foré (danrabbit)]

Something with the files open is broken. Clicking a local .jpg image gives me a "folder does not exist" error

[Danielle Foré (danrabbit)]

Probably related to the above error, sorting is now broken. Files doesn't seem to know the difference between folders and files.

[Jeremy Wootten (jeremywootten)]

rev 1695 fixes 'Right click a breadcrumb in a local path > Open in New Tab > "Unable to mount folder"'

rev 1696 fixes 'Something with the files open is broken. Clicking a local .jpg image gives me a "folder does not exist" error' and 'sorting is now broken. Files doesn't seem to know the difference between folders and files.'

[Danielle Foré (danrabbit)]

Great, thanks for addressing those regressions! I'm noticing now, however, that my XDG folders don't seem to have special icons. They only have the default folder icon.

[Danielle Foré (danrabbit)]

Cody and I have been testing, so we're gonna merge. Thanks Jeremy!

review: Approve

=== modified file 'libcore/AbstractSlot.vala'
--- libcore/AbstractSlot.vala	2014-11-01 11:27:38 +0000
+++ libcore/AbstractSlot.vala	2015-02-07 19:01:29 +0000
@@ -69,7 +69,9 @@
         public virtual void zoom_in () {}
         public virtual void zoom_normal () {}
         public virtual bool set_all_selected (bool all_selected) {return false;}
-        public virtual Gtk.Widget get_content_box () {return content_box as Gtk.Widget;}
+        public virtual Gtk.Widget get_content_box () {
+            return content_box as Gtk.Widget;
+        }
         public virtual string? get_root_uri () {return directory.file.uri;}
         public virtual string? get_tip_uri () {return null;}
     }

=== modified file 'libcore/gof-callwhenready.vala'
--- libcore/gof-callwhenready.vala	2014-11-21 19:24:45 +0000
+++ libcore/gof-callwhenready.vala	2015-02-07 19:01:29 +0000
@@ -36,10 +36,8 @@
             if (gof.info == null) {
                 call_when_ready_list.prepend (gof);
                 query_info_async.begin (gof, file_ready);
-                //message ("cwr %s", gof.uri);
-            } else {
+            } else
                 count++;
-            }
         }
 
         /* we didn't need to queue anything, all the infos were available */
@@ -51,7 +49,6 @@
 
     private void file_ready (GOF.File gof) {
         gof.update ();
-        //message ("file ready %s", gof.uri);
     }
 
     /* TODO move this to GOF.File */
@@ -67,7 +64,7 @@
             if (fqi != null)
                 fqi (gof);
         } catch (Error err) {
-            warning ("query info failed, %s %s", err.message, gof.uri);
+            debug ("query info failed, %s %s", err.message, gof.uri);
             if (err is IOError.NOT_FOUND)
                 gof.exists = false;
             if (err is IOError.NOT_MOUNTED)
@@ -76,7 +73,7 @@
 
         call_when_ready_list.remove (gof);
         if (call_when_ready_list == null) {
-            message ("call when ready OK - empty list");
+            debug ("call when ready OK - empty list");
             if (f != null)
                 f (files);
         }

=== modified file 'libcore/gof-directory-async.vala'
--- libcore/gof-directory-async.vala	2015-01-26 10:32:04 +0000
+++ libcore/gof-directory-async.vala	2015-02-07 19:01:29 +0000
@@ -22,6 +22,7 @@
 
 public class GOF.Directory.Async : Object {
     public GLib.File location;
+    public GLib.File? selected_file = null;
     public GOF.File file;
     public int icon_size = 32;
 
@@ -64,7 +65,6 @@
 
     private unowned string gio_attrs {
         get {
-            var scheme = location.get_uri_scheme ();
             if (scheme == "network" || scheme == "computer" || scheme == "smb")
                 return "*";
             else
@@ -72,14 +72,35 @@
         }
     }
 
+    private string scheme;
+    public bool is_local;
+    public bool is_trash;
+    public bool has_trash_dirs;
+    public bool can_load;
+    private bool _is_ready;
+    public bool is_ready {
+        get { return _is_ready;}
+        private set {_is_ready = value;}
+    }
+
+    public bool is_cancelled {
+        get { return cancellable.is_cancelled (); }
+    }
+
     private Async (GLib.File _file) {
         location = _file;
         file = GOF.File.get (location);
-        file.exists = true;
         cancellable = new Cancellable ();
-
-        if (file.info == null)
-            file.query_update ();
+        state = State.NOT_LOADED;
+        is_ready = false;
+        can_load = true;
+
+        scheme = location.get_uri_scheme ();
+        is_trash = (scheme == "trash");
+        is_local = is_trash || (scheme == "file");
+
+        if (!prepare_directory ())
+            return;
 
         assert (directory_cache != null);
         directory_cache.insert (location, this);
@@ -92,6 +113,113 @@
         uri_contain_keypath_icons = "/icons" in file.uri || "/.icons" in file.uri;
     }
 
+    /* This is also called when reloading the directory so that another attempt to connect to
+     * the network is made */
+    private bool prepare_directory () {
+        if (!get_file_info ()) {
+            is_ready = true;
+            /* local uris are deemed loadable even if they do not exist
+             * If they do not exist an opportunity will be given to create them */
+            can_load = is_local;
+            return false;
+        }
+
+        if (!file.is_folder () && !file.is_root_network_folder () && !try_parent ()) {
+            is_ready = true;
+            can_load = false;
+            return false;
+        }
+        return true;
+    }
+
+    private bool try_parent () {
+        if (file.is_connected) {
+            GLib.File? parent = location.get_parent ();
+            if (parent != null) {
+                file = GOF.File.get (parent);
+                selected_file = location.dup ();
+                location = parent;
+                if (get_file_info ())
+                    return true;
+            }
+        }
+        return false;
+    }
+
+    private bool get_file_info () { 
+        if (!is_local && !check_network ()) {
+            return false;
+        }
+
+        if (!file.ensure_query_info()) {
+            if (is_local || !file.is_connected)
+                return false;
+        }
+
+        can_load = true;
+        if (!is_local) {
+            mount_mountable.begin ((obj,res) => {
+                can_load = false;
+                try {
+                    mount_mountable.end (res);
+                    can_load = true;
+                } catch (Error e) {
+                    debug ("mount_mountable failed: %s", e.message);
+
+                    if (e is IOError.ALREADY_MOUNTED) {
+                        can_load = true;
+                    } else if (e is IOError.PERMISSION_DENIED ||
+                               e is IOError.FAILED_HANDLED) {
+
+                        permission_denied = true;
+                    }
+                }
+                make_ready ();
+            });
+        } else 
+            make_ready ();
+
+        return true;
+    }
+
+    public bool check_network () {
+        var net_mon = GLib.NetworkMonitor.get_default ();
+        var net_available = net_mon.get_network_available ();
+
+        if (!net_available) {
+            SocketConnectable? connectable = null;
+            try {
+                connectable = NetworkAddress.parse_uri (file.uri, 21);
+            }
+            catch (GLib.Error e) {}
+
+            if (connectable != null) {
+                try {
+                    if (net_mon.can_reach (connectable))
+                        return true;
+                }
+                catch (GLib.Error e) {}
+            }
+
+            return false;
+        }
+
+        return true;
+    }
+
+    private void make_ready () {
+        is_ready = true;
+        unowned GLib.List? trash_dirs = null;
+        file.mount = GOF.File.get_mount_at (location);
+
+        if (file.mount != null) {
+            file.is_mounted = true;
+            trash_dirs = Marlin.FileOperations.get_trash_dirs_for_mount (file.mount);
+            has_trash_dirs = (trash_dirs != null);
+        } else
+            has_trash_dirs = is_local;
+    }
+
     private static void toggle_ref_notify (void* data, Object object, bool is_last) {
         return_if_fail (object != null && object is Object);
         if (is_last) {
@@ -102,7 +230,6 @@
                 dir.remove_dir_from_cache ();
 
             dir.remove_toggle_ref ((ToggleNotify) toggle_ref_notify);
-        } else {
         }
     }
 
@@ -122,9 +249,11 @@
             idle_consume_changes_id = 0;
         }
 
+        if (file_hash != null)
+            file_hash.remove_all ();
+
         monitor = null;
         sorted_dirs = null;
-        file_hash.remove_all ();
         files_count = 0;
         state = State.NOT_LOADED;
     }
@@ -141,14 +270,11 @@
     public void load (GOFFileLoadedFunc? file_loaded_func = null) {
         cancellable.reset ();
         longest_file_name = "";
-
+        permission_denied = false;
         if (state == State.LOADING)
             return;
 
         if (state != State.LOADED) {
-            /* clear directory info if it's not fully loaded */
-            if (state == State.LOADING)
-                clear_directory_info ();
 
             list_directory.begin (file_loaded_func);
 
@@ -159,7 +285,8 @@
                     monitor.changed.connect (directory_changed);
                 } catch (IOError e) {
                     if (!(e is IOError.NOT_MOUNTED)) {
-                        warning ("directory monitor failed: %s %s", e.message, file.uri);
+                        /* Will fail for remote filesystems - not an error */
+                        debug ("directory monitor failed: %s %s", e.message, file.uri);
                     }
                 }
             }
@@ -200,6 +327,8 @@
             monitor_blocked = false;
             monitor.changed.connect (directory_changed);
         }
+        if (!is_local)
+            need_reload ();
     }
 
     private void update_longest_file_name (GOF.File gof) {
@@ -208,11 +337,14 @@
     }
 
     public void load_hiddens () {
+        if (!can_load)
+            return;
+
         if (state != State.LOADED) {
             load ();
         } else {
             foreach (GOF.File gof in file_hash.get_values ()) {
-                if (gof != null && gof.info != null && gof.is_hidden) {
+                if (gof != null && gof.is_hidden) {
                     if (track_longest_name)
                         update_longest_file_name (gof);
 
@@ -220,8 +352,8 @@
                 }
             }
         }
-        if (!cancellable.is_cancelled ())
-            done_loading ();
+
+        done_loading ();
     }
 
     public void update_desktop_files () {
@@ -229,45 +361,40 @@
             if (gof != null && gof.info != null
                 && (!gof.is_hidden || Preferences.get_default ().pref_show_hidden_files)
                 && gof.is_desktop)
+
                 gof.update_desktop_file ();
         }
     }
 
     public async void mount_mountable () throws Error {
-        debug ("mount_mountable %s", file.uri);
-
         /* TODO pass GtkWindow *parent to Gtk.MountOperation */
         var mount_op = new Gtk.MountOperation (null);
-
-        if (file.file_type != FileType.MOUNTABLE)
-            yield location.mount_enclosing_volume (0, mount_op, cancellable);
-        else
-            yield location.mount_mountable (0, mount_op, cancellable);
-
-        file.is_mounted = true;
-        yield query_info_async (file, file_info_available);
+        yield location.mount_enclosing_volume (0, mount_op, cancellable);
     }
 
     private async void list_directory (GOFFileLoadedFunc? file_loaded_func = null) {
+        if (!can_load) {
+            state = State.NOT_LOADED;
+            return;
+        }
+
         file.exists = true;
         files_count = 0;
         state = State.LOADING;
 
-        debug ("list directory %s", file.uri);
-
         try {
             var e = yield this.location.enumerate_children_async (gio_attrs, 0, 0, cancellable);
             while (state == State.LOADING) {
                 var files = yield e.next_files_async (200, 0, cancellable);
-
                 if (files == null)
                     break;
 
                 bool show_hidden =  Preferences.get_default ().pref_show_hidden_files;
 
                 foreach (var file_info in files) {
-                    GLib.File loc = location.get_child ((string) file_info.get_name ());
-                    GOF.File gof = GOF.File.cache_lookup (loc);
+                    string uri = Path.build_filename (location.get_uri (), file_info.get_name ());
+                    GLib.File loc = GLib.File.new_for_uri (uri);
+                    GOF.File? gof = GOF.File.cache_lookup (loc);
 
                     if (gof == null)
                         gof = new GOF.File (loc, location);
@@ -295,22 +422,21 @@
                 file.exists = true;
                 state = State.LOADED;
             } else {
-                debug ("WARNING load() has been called again before LOADING finished");
+                warning ("WARNING load() has been called again before LOADING finished");
                 return;
             }
         } catch (Error err) {
-            warning ("%s %s", err.message, file.uri);
+            warning ("Listing directory error: %s %s", err.message, file.uri);
             state = State.NOT_LOADED;
 
             if (err is IOError.NOT_FOUND || err is IOError.NOT_DIRECTORY)
                 file.exists = false;
-
             else if (err is IOError.PERMISSION_DENIED)
                 permission_denied = true;
-
             else if (err is IOError.NOT_MOUNTED)
                 file.is_mounted = false;
         }
+
         if (file_loaded_func == null && !cancellable.is_cancelled ())
             done_loading ();
     }
@@ -366,7 +492,7 @@
 
         gof.update ();
 
-        if (gof.info != null && (!gof.is_hidden || Preferences.get_default ().pref_show_hidden_files))
+        if ((!gof.is_hidden || Preferences.get_default ().pref_show_hidden_files))
             file_added (gof);
 
         if (!gof.is_hidden && gof.is_folder ()) {
@@ -380,10 +506,6 @@
         }
     }
 
-    private void file_info_available (GOF.File gof) {
-        gof.update ();
-    }
-
     private void notify_file_changed (GOF.File gof) {
         query_info_async.begin (gof, changed_and_refresh);
     }
@@ -549,7 +671,11 @@
 
     public static Async from_gfile (GLib.File file) {
         /* Note: cache_lookup creates directory_cache if necessary */
-        return cache_lookup (file) ?? new Async (file);
+        Async?  dir = cache_lookup (file);
+        if (dir != null && !dir.is_local)
+                dir = null;
+
+        return dir ?? new Async (file);
     }
 
     public static Async from_file (GOF.File gof) {
@@ -578,7 +704,7 @@
         cached_dir = directory_cache.lookup (file);
 
         if (cached_dir != null) {
-            debug ("found cached dir %s\n", cached_dir.file.uri);
+            debug ("found cached dir %s", cached_dir.file.uri);
             if (cached_dir.file.info == null)
                 cached_dir.file.query_update ();
         }
@@ -645,12 +771,11 @@
             return sorted_dirs;
 
         foreach (var gof in file_hash.get_values()) {
-            if (gof.info != null && !gof.is_hidden && gof.is_folder ())
+            if (!gof.is_hidden && gof.is_folder ())
                 sorted_dirs.prepend (gof);
         }
 
         sorted_dirs.sort (GOF.File.compare_by_display_name);
-
         return sorted_dirs;
     }
 
@@ -714,6 +839,9 @@
     }
 
     public void queue_load_thumbnails (int size) {
+        if (!is_local)
+            return;
+
         icon_size = size;
         if (this.state == State.LOADING)
             return;

=== modified file 'libcore/gof-file.c'
--- libcore/gof-file.c	2015-01-16 23:04:51 +0000
+++ libcore/gof-file.c	2015-02-07 19:01:29 +0000
@@ -68,7 +68,6 @@
 }
 
 const gchar     *gof_file_get_thumbnail_path (GOFFile *file);
-static GMount   *get_mount_at (GFile *target);
 
 static GIcon *
 get_icon_user_special_dirs(char *path)
@@ -175,19 +174,6 @@
     file->can_unmount = FALSE;
 }
 
-static gboolean
-gof_file_compare_uri_schemes (GOFFile *file, const char **schemes)
-{
-    int iterator;
-
-    for (iterator = 0; iterator < G_N_ELEMENTS (schemes); iterator++) {
-        if (g_file_has_uri_scheme (file->location, schemes[iterator]))
-            return TRUE;
-    }
-
-    return FALSE;
-}
-
 /**
  * gof_file_is_location_uri_default:
  *
@@ -198,56 +184,130 @@
 static gboolean
 gof_file_is_location_uri_default (GOFFile *file)
 {
+    g_return_val_if_fail (file->info != NULL, FALSE);
+    gboolean res;
+
     const char *target_uri = g_file_info_get_attribute_string (file->info, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI);
 
-    if (target_uri != NULL) {
-        gchar **split = g_strsplit (target_uri, "/", 4);
-        if (split[3] == NULL || !strcmp (split[3], "")) {
-            g_strfreev (split);
-            return TRUE;
+    if (target_uri == NULL)
+        target_uri = file->uri;
+
+    gchar **split = g_strsplit (target_uri, "/", 4);
+    res = (split[3] == NULL || !strcmp (split[3], ""));
+    g_strfreev (split);
+
+    return res;
+}
+
+gboolean
+gof_file_is_mountable (GOFFile *file) {
+    g_return_val_if_fail (file->info != NULL, FALSE);
+    return g_file_info_get_file_type(file->info) == G_FILE_TYPE_MOUNTABLE;
+}
+
+guint
+get_number_of_uri_parts (GOFFile *file) {
+    const char *target_uri = NULL;
+    if (file->info != NULL)
+        target_uri = g_file_info_get_attribute_string (file->info, G_FILE_ATTRIBUTE_STANDARD_TARGET_URI);
+
+    if (target_uri == NULL)
+        target_uri = file->uri;
+
+    gchar **split = g_strsplit (target_uri, "/", 6);
+    guint i, count;
+    count = 0;
+    for (i = 0; i < g_strv_length (split); i++) {
+        if (split [i][0] != NULL) {
+            count++;
         }
-        g_strfreev (split);
-    }
-
-    return FALSE;
+    }
+    g_strfreev (split);
+    return count;
+}
+
+gboolean
+gof_file_is_smb_share (GOFFile *file)
+{
+    gboolean res;
+    res = FALSE;
+
+    if (gof_file_is_smb_uri_scheme (file) || gof_file_is_network_uri_scheme (file)) {
+        res = get_number_of_uri_parts (file) == 3;
+    }
+
+    return res;
+}
+
+gboolean
+gof_file_is_smb_server (GOFFile *file)
+{
+    gboolean res;
+    res = FALSE;
+
+    if (gof_file_is_smb_uri_scheme (file) || gof_file_is_network_uri_scheme (file)){
+        res = get_number_of_uri_parts (file) == 2;
+    }
+
+    return res;
 }
 
 gboolean
 gof_file_is_remote_uri_scheme (GOFFile *file)
 {
-    if (gof_file_is_root_network_folder (file))
+    if (gof_file_is_root_network_folder (file) || gof_file_is_other_uri_scheme (file))
         return TRUE;
-
-    const char* SCHEMES[] = { "afp", "dav", "davs", "ftp", "sftp" };
-    return gof_file_compare_uri_schemes (file, SCHEMES);
 }
 
 gboolean
 gof_file_is_root_network_folder (GOFFile *file)
 {
-    if (gof_file_is_network_uri_scheme (file))
-        return TRUE;
-
-    return (gof_file_is_smb_uri_scheme (file) && gof_file_is_location_uri_default (file));
+    return (gof_file_is_network_uri_scheme (file) || gof_file_is_smb_server (file));
 }
 
 gboolean
 gof_file_is_network_uri_scheme (GOFFile *file)
 {
-    const char* SCHEMES[] = { "network" };
-    return gof_file_compare_uri_schemes (file, SCHEMES);
+    if (!G_IS_FILE (file->location))
+        return TRUE;
+
+    return g_file_has_uri_scheme (file->location, "network");
 }
 
 gboolean
 gof_file_is_smb_uri_scheme (GOFFile *file)
 {
-    const char* SCHEMES[] = { "smb" };
-    return gof_file_compare_uri_schemes (file, SCHEMES);
-}
-
-void    gof_file_get_folder_icon_from_uri_or_path (GOFFile *file)
-{
-    if (!file->is_hidden && file->uri != NULL && file->icon == NULL) {
+    if (!G_IS_FILE (file->location))
+        return TRUE;
+
+    return g_file_has_uri_scheme (file->location, "smb");
+}
+
+gboolean
+gof_file_is_other_uri_scheme (GOFFile *file)
+{
+    GFile *loc = file->location;
+    if (!G_IS_FILE (file->location))
+        return TRUE;
+
+    gboolean res;
+
+    res = g_file_has_uri_scheme (loc, "ftp") ||
+          g_file_has_uri_scheme (loc, "sftp") ||
+          g_file_has_uri_scheme (loc, "afp") ||
+          g_file_has_uri_scheme (loc, "dav") ||
+          g_file_has_uri_scheme (loc, "davs");
+
+    return res;
+}
+
+void
+gof_file_get_folder_icon_from_uri_or_path (GOFFile *file)
+{
+    if (file->icon != NULL)
+        return;
+
+    if (!file->is_hidden && file->uri != NULL) {
         char *path = g_filename_from_uri (file->uri, NULL, NULL);
         file->icon = get_icon_user_special_dirs(path);
         _g_free0 (path);
@@ -364,8 +424,10 @@
             file->target_location = g_file_new_for_uri (target_uri);
             gof_file_target_location_update (file);
 
-            if (file->file_type == G_FILE_TYPE_MOUNTABLE)
-                file->mount = get_mount_at (file->target_location);
+            if (file->file_type == G_FILE_TYPE_MOUNTABLE) {
+                file->mount = gof_file_get_mount_at (file->target_location);
+                file->is_mounted = (file->mount != NULL);
+            }
         }
     }
 
@@ -457,10 +519,8 @@
 
     /* sizes */
     gof_file_update_size (file);
-
     /* modified date */
     file->formated_modified = gof_file_get_formated_time (file, G_FILE_ATTRIBUTE_TIME_MODIFIED);
-
     /* icon */
     if (file->is_directory) {
         gof_file_get_folder_icon_from_uri_or_path (file);
@@ -486,25 +546,30 @@
     file->permissions = g_file_info_get_attribute_uint32 (file->info, G_FILE_ATTRIBUTE_UNIX_MODE);
     const char *owner = g_file_info_get_attribute_string (file->info, G_FILE_ATTRIBUTE_OWNER_USER);
     const char *group = g_file_info_get_attribute_string (file->info, G_FILE_ATTRIBUTE_OWNER_GROUP);
+
     if (owner != NULL)
         file->owner = strdup (owner);
+
     if (group != NULL)
         file->group = strdup (group);
+
     if (g_file_info_has_attribute (file->info, G_FILE_ATTRIBUTE_UNIX_UID)) {
         file->uid = g_file_info_get_attribute_uint32 (file->info, G_FILE_ATTRIBUTE_UNIX_UID);
         if (file->owner == NULL)
             file->owner = g_strdup_printf ("%d", file->uid);
     }
+
     if (g_file_info_has_attribute (file->info, G_FILE_ATTRIBUTE_UNIX_GID)) {
         file->gid = g_file_info_get_attribute_uint32 (file->info, G_FILE_ATTRIBUTE_UNIX_GID);
         if (file->group == NULL)
             file->group = g_strdup_printf ("%d", file->gid);
     }
 
-    if (g_file_info_has_attribute (file->info, G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT)) {
+    if (g_file_info_has_attribute (file->info, G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT))
         file->can_unmount = g_file_info_get_attribute_boolean (file->info, G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT);
-	}
+
     gof_file_update_trash_info (file);
+
     gof_file_update_emblem (file);
 }
 
@@ -551,7 +616,6 @@
     if (flags & GOF_FILE_ICON_FLAGS_USE_THUMBNAILS
         && file->flags == GOF_FILE_THUMB_STATE_LOADING) {
         gicon = g_themed_icon_new (ICON_NAME_THUMBNAIL_LOADING);
-        //printf ("thumbnail loading\n");
     } else {
         gicon = _g_object_ref0 (file->icon);
     }
@@ -645,6 +709,14 @@
 
 void gof_file_update_emblem (GOFFile *file)
 {
+    /* Do not try to add emblems to network and remote files (except smb) - can cause blocking io*/
+    if (gof_file_is_other_uri_scheme (file) || gof_file_is_network_uri_scheme (file))
+        return;
+
+    /* Do not try to add emblems to smb shares either */
+    if (gof_file_is_smb_share (file))
+        return;
+
     /* erase previous stored emblems */
     if (file->emblems_list != NULL) {
         g_list_free (file->emblems_list);
@@ -654,6 +726,7 @@
     if(plugins != NULL)
         marlin_plugin_manager_update_file_info (plugins, file);
 
+
     if(gof_file_is_symlink(file) || (file->is_desktop && file->target_gof))
     {
         gof_file_add_emblem(file, "emblem-symbolic-link");
@@ -670,10 +743,12 @@
         else
             gof_file_add_emblem (file, "emblem-unreadable");
     }
+
     /* TODO update signal on real change */
     //g_warning ("update emblem %s", file.uri);
     if (file->emblems_list != NULL)
         gof_file_icon_changed (file);
+
 }
 
 void gof_file_add_emblem (GOFFile* file, const gchar* emblem)
@@ -694,13 +769,13 @@
 {
     if (error != NULL)
     {
-        g_warning ("%s [code %d]\n", error->message, error->code);
+        g_debug ("%s [code %d]\n", error->message, error->code);
         g_clear_error (&error);
     }
 }
 
-static GMount *
-get_mount_at (GFile *target)
+GMount *
+gof_file_get_mount_at (GFile *target)
 {
     GVolumeMonitor *monitor;
     GFile *root;
@@ -738,18 +813,21 @@
     GFileInfo *info = NULL;
     GError *err = NULL;
 
-    info = g_file_query_info (file->location, GOF_FILE_GIO_DEFAULT_ATTRIBUTES,
-                              0, NULL, &err);
+    g_return_val_if_fail (G_IS_FILE (file->location), NULL);
+
+    info = g_file_query_info (file->location, "*", 0, NULL, &err);
 
     if (err != NULL) {
         if (err->domain == G_IO_ERROR && err->code == G_IO_ERROR_NOT_MOUNTED) {
             file->is_mounted = FALSE;
-        }
-        if (err->code == G_IO_ERROR_NOT_FOUND
+        } else if (err->code == G_IO_ERROR_NOT_FOUND
             || err->code == G_IO_ERROR_NOT_DIRECTORY) {
             file->exists = FALSE;
+        } else if (err->code == G_IO_ERROR_TIMED_OUT) {
+            file->is_connected = FALSE;
         }
-        print_error (err);
+
+        print_error (err); /* also frees error */
     }
     return info;
 }
@@ -853,6 +931,7 @@
     /* assume the file is mounted by default */
     file->is_mounted = TRUE;
     file->exists = TRUE;
+    file->is_connected = TRUE;
 
     file->flags = 0;
     file->pix_size = -1;
@@ -878,10 +957,8 @@
 #endif
 
     g_clear_object (&file->info);
-    if (file->location)
-        g_object_unref (file->location);
-    if (file->directory)
-        g_object_unref (file->directory);
+    _g_object_unref0 (file->location);
+    _g_object_unref0 (file->directory);
     _g_free0 (file->uri);
     _g_free0(file->basename);
     _g_free0(file->utf8_collation_key);
@@ -889,8 +966,7 @@
     _g_free0(file->format_size);
     _g_free0(file->formated_modified);
     _g_object_unref0 (file->icon);
-    if (file->pix)
-        g_object_unref (file->pix);
+    _g_object_unref0 (file->pix);
     //g_clear_object (&file->pix);
 
     _g_free0 (file->custom_display_name);
@@ -1121,7 +1197,6 @@
     }
 
     result = gof_file_compare_for_sort_internal (file1, file2, directories_first, reversed);
-    //g_message ("res %d %s %s\n", result, file1->name, file2->name);
 
     if (result == 0) {
         switch (sort_type) {
@@ -1216,15 +1291,19 @@
 {
     g_return_val_if_fail (GOF_IS_FILE (file), FALSE);
 
-    if (file->target_gof)
+    /* Take care not to create infinite loop */
+    if (file->target_gof && !g_file_equal (file->location, file->target_gof->location))
         return gof_file_is_writable (file->target_gof);
+
     if (file->info == NULL)
         return FALSE;
+
     if (!g_file_info_has_attribute (file->info, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE)) {
-        /* For some reason, the trash folder doesn't have this attribute defined.
-         * The function must be forced to return TRUE if the folder in question
-         * is the trash folder (since it is writable). */
-        if (strncmp (file->uri, "trash:///", 10) == 0)
+        /* Trash folder and network folders do not necessarily have this attribute defined.
+         * The function must be forced to return TRUE in these cases. */
+        if (strncmp (file->uri, "trash:///", 10) == 0 ||
+            gof_file_is_smb_uri_scheme (file) ||
+            gof_file_is_remote_uri_scheme (file))
             return TRUE;
 
         return FALSE;
@@ -1578,16 +1657,20 @@
     /* default to whatever GTK+ thinks for the suggested action */
     suggested_action = gdk_drag_context_get_suggested_action (context);
 
-    char *uri = g_file_get_uri (file_list->data);
-    g_debug ("%s %s %s\n", G_STRFUNC, file->uri, uri);
-    _g_free0 (uri);
-
     /* check if we have a writable directory here or an executable file */
     if (gof_file_is_folder (file) && gof_file_is_writable (file))
     {
         /* determine the possible actions */
         actions = gdk_drag_context_get_actions (context) & (GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK | GDK_ACTION_ASK);
 
+        char *scheme;
+        scheme = g_file_get_uri_scheme (gof_file_get_target_location (file));
+        /* do not allow symbolic links to remote filesystems */
+        if (!g_str_has_prefix (scheme, "file"))
+            actions &= ~(GDK_ACTION_LINK);
+
+        g_free (scheme);
+
         /* cannot create symbolic links in the trash or copy to the trash */
         if (gof_file_is_trashed (file))
             actions &= ~(GDK_ACTION_COPY | GDK_ACTION_LINK);
@@ -1595,12 +1678,16 @@
         /* check up to 100 of the paths (just in case somebody tries to
          * drag around his music collection with 5000 files).
          */
+
         for (lp = file_list, n = 0; lp != NULL && n < 100; lp = lp->next, ++n)
         {
-            uri = g_file_get_uri (lp->data);
-            g_debug ("%s %s %s\n", G_STRFUNC, file->uri, uri);
-            _g_free0 (uri);
+            scheme = g_file_get_uri_scheme (lp->data);
+            if (!g_str_has_prefix (scheme, "file")) {
+                /* do not allow symbolic links from remote filesystems */
+                actions &= ~(GDK_ACTION_LINK);
+            }
 
+            g_free (scheme);
             /* we cannot drop a file on itself */
             if (G_UNLIKELY (g_file_equal (gof_file_get_target_location (file), lp->data)))
                 return 0;
@@ -1649,21 +1736,18 @@
                         && g_file_info_get_attribute_uint32 (ofile->info,
                                                              G_FILE_ATTRIBUTE_UNIX_UID) != effective_user_id))
                 {
-                    //printf ("%s default suggested action GDK_ACTION_COPY\n", G_STRFUNC);
                     /* default to copy and get outa here */
                     suggested_action = GDK_ACTION_COPY;
                     break;
                 }
             }
-            //printf ("%s actions MOVE %d COPY %d suggested %d\n", G_STRFUNC, GDK_ACTION_MOVE, GDK_ACTION_COPY, suggested_action);
         }
     }
     else if (!gof_file_is_folder (file) && gof_file_is_executable (file))
     {
         /* determine the possible actions */
         actions = gdk_drag_context_get_actions (context) & (GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK | GDK_ACTION_PRIVATE);
-    }
-    else
+    } else
         return 0;
 
     /* determine the preferred action based on the context */
@@ -1914,7 +1998,7 @@
     gfiles = gof_files_get_location_list (files);
 
     succeed = g_app_info_launch (app_info, gfiles, G_APP_LAUNCH_CONTEXT (context), &error);
-    print_error (error);
+    print_error (error); /* also frees error */
 
     g_list_free_full (gfiles, (GDestroyNotify) eel_g_file_unref);
     g_object_unref (context);
@@ -2387,12 +2471,26 @@
 gboolean
 gof_file_is_folder (GOFFile *file)
 {
-    /* TODO check */
-    if (file->is_directory)
-        return TRUE;
-    if (file->target_location != NULL
-        && ( (file->file_type == G_FILE_TYPE_MOUNTABLE && g_file_info_get_attribute_boolean (file->info, G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT)) || (file->target_gof && file->target_gof->is_directory && gof_preferences_get_default ()->pref_interpret_desktop_files) ))
-        return TRUE;
+    /* TODO check this works for non-local files and other uri schemes*/
+    if ((file->is_directory || gof_file_get_ftype (file) == NULL) && !gof_file_is_root_network_folder (file))
+        return TRUE;
+
+    if (gof_file_is_smb_share (file))
+        return TRUE;
+
+    if (file->file_type == G_FILE_TYPE_MOUNTABLE &&
+        file->info != NULL &&
+        g_file_info_get_attribute_boolean (file->info, G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT))
+
+        return TRUE;
+
+    if (file->target_gof && file->target_gof->is_directory) {
+        /* file->target_gof is directory */
+        if (gof_preferences_get_default ()->pref_interpret_desktop_files ||
+            gof_file_is_network_uri_scheme (file->target_gof))
+
+            return TRUE;
+    }
 
     return FALSE;
 }
@@ -2400,13 +2498,16 @@
 const gchar *
 gof_file_get_ftype (GOFFile *file)
 {
-    g_return_val_if_fail (file->info != NULL, NULL);
+    if (file->info == NULL || gof_file_is_location_uri_default (file))
+        return NULL;
 
     const char *ftype = NULL;
     if (g_file_info_has_attribute (file->info, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE))
         return g_file_info_get_attribute_string (file->info, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE);
+
     if (g_file_info_has_attribute (file->info, G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE))
         ftype = g_file_info_get_attribute_string (file->info, G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE);
+
     if (!g_strcmp0 (ftype, "application/octet-stream") && file->tagstype)
         return file->tagstype;
 

=== modified file 'libcore/gof-file.h'
--- libcore/gof-file.h	2014-11-21 19:24:45 +0000
+++ libcore/gof-file.h	2015-02-07 19:01:29 +0000
@@ -94,6 +94,7 @@
     int             color;
     gboolean        is_mounted;
     gboolean        exists;
+    gboolean        is_connected;
 
     gboolean        has_permissions;
     guint32         permissions;
@@ -222,6 +223,7 @@
                                  gpointer callback_data);
 void            gof_file_set_thumb_state (GOFFile *file, GOFFileThumbState state);
 void            gof_file_add_emblem(GOFFile* file, const gchar* emblem);
+GMount*         gof_file_get_mount_at (GFile* target);
 
 /* To provide a wrapper around g_file_get_uri (not sure it is really useful tough) */
 #define gof_file_get_uri(obj) g_file_get_uri(obj->location)
@@ -256,6 +258,9 @@
 gboolean        gof_file_is_root_network_folder (GOFFile *file);
 gboolean        gof_file_is_network_uri_scheme (GOFFile *file);
 gboolean        gof_file_is_smb_uri_scheme (GOFFile *file);
+gboolean        gof_file_is_smb_share (GOFFile *file);
+gboolean        gof_file_is_smb_server (GOFFile *file);
+gboolean        gof_file_is_mountable (GOFFile *file);
 gboolean        gof_file_thumb_can_frame (GOFFile *file);
 
 char            *gof_file_get_display_target_uri (GOFFile *file);

=== modified file 'libcore/marlin-file-operations.c'
--- libcore/marlin-file-operations.c	2015-01-16 18:03:50 +0000
+++ libcore/marlin-file-operations.c	2015-02-07 19:01:29 +0000
@@ -2058,6 +2058,7 @@
 
     common = (CommonJob *)job;
     common->io_job = io_job;
+
 #ifdef ENABLE_TASKVIEW
     taskview_generic_set_state (TASKVIEW_GENERIC (job->common.tv_io), TASKVIEW_RUNNING);
 #else
@@ -2074,19 +2075,19 @@
     for (l = job->files; l != NULL; l = l->next) {
         file = l->data;
 
-        if (job->try_trash &&
-            g_file_has_uri_scheme (file, "trash")) {
+        if (job->try_trash && g_file_has_uri_scheme (file, "trash")) {
             must_confirm_delete_in_trash = TRUE;
             to_delete_files = g_list_prepend (to_delete_files, file);
         } else if (can_delete_without_confirm (file)) {
             to_delete_files = g_list_prepend (to_delete_files, file);
         } else {
-            if (job->try_trash) {
+            if (job->try_trash &&
+                !g_file_has_uri_scheme (file, "smb")) {
                 to_trash_files = g_list_prepend (to_trash_files, file);
             } else {
                 must_confirm_delete = TRUE;
                 to_delete_files = g_list_prepend (to_delete_files, file);
-            }
+            } 
         }
     }
 
@@ -2153,14 +2154,11 @@
         inhibit_power_manager ((CommonJob *)job, _("Deleting Files"));
     }
 
-    // Start UNDO-REDO
     if (try_trash && !marlin_undo_manager_is_undo_redo (marlin_undo_manager_instance())) {
         job->common.undo_redo_data = marlin_undo_manager_data_new (MARLIN_UNDO_MOVETOTRASH, g_list_length(files));
-        //undotest usefull ??
         GFile* src_dir = g_file_get_parent (files->data);
         marlin_undo_manager_data_set_src_dir (job->common.undo_redo_data, src_dir);
     }
-    // End UNDO-REDO
 
     g_io_scheduler_push_job (delete_job,
                              job,
@@ -4353,6 +4351,10 @@
                            &error);
     }
 
+    /* NOTE Result is false if file being moved is a folder and the target is on a Samba share even if
+     * the file is successfully copied, so the change will not be notified to the view.
+     * The view will need to be refreshed anyway */
+
     if (res) {
         transfer_info->num_files ++;
         report_copy_progress (copy_job, source_info, transfer_info);
@@ -4579,8 +4581,9 @@
             g_error_free (error);
             goto out;
         }
-        primary = f (_("There was an Error while copying \"%s\"."), g_file_get_uri (src));
-        secondary = f (_("There was an error copying the file into %s."), g_file_get_uri (dest_dir));
+
+        primary = f (_("Cannot copy \"%B\" here."), src);
+        secondary = f (_("There was an error copying the file into %B."), dest_dir);
         details = error->message;
 
         response = run_warning (job,
@@ -5466,9 +5469,15 @@
     not_local = FALSE;
 
     path = get_abs_path_for_symlink (src);
-    if (path == NULL) {
+    char *scheme;
+    scheme = g_file_get_uri_scheme (src);
+
+    if (path == NULL || !g_str_has_prefix (scheme, "file"))
         not_local = TRUE;
-    } else if (g_file_make_symbolic_link (dest,
+
+    g_free (scheme);
+
+    if (!not_local && g_file_make_symbolic_link (dest,
                                           path,
                                           common->cancellable,
                                           &error)) {
@@ -5478,6 +5487,7 @@
         // End UNDO-REDO
 
         g_free (path);
+
         if (debuting_files) {
             g_hash_table_replace (debuting_files, g_object_ref (dest), GINT_TO_POINTER (TRUE));
         }
@@ -5946,7 +5956,7 @@
                                     GFile                  *target_dir,
                                     GdkDragAction          copy_action,
                                     GtkWidget              *parent_view,
-                                    gpointer               done_callback,
+                                    GCallback              done_callback,
                                     gpointer               done_callback_data)
 {
     GList *p;
@@ -5981,6 +5991,19 @@
     }
 
     if (copy_action == GDK_ACTION_COPY) {
+        if (g_file_has_uri_scheme (target_dir, "trash")) {
+            char *primary = f (_("Cannot copy into trash."));
+            char *secondary = f (_("It is not permitted to copy files into the trash"));
+            eel_show_error_dialog (primary,
+                                   secondary,
+                                   parent_window);
+
+            if (done_callback != NULL)
+                ((MarlinDeleteCallback)done_callback) (TRUE, done_callback_data);
+
+            return;
+        }
+
         /* done_callback is (or should be) a CopyCallBack or null in this case */
         src_dir = g_file_get_parent (files->data);
         if (target_dir == NULL ||

=== modified file 'libcore/marlin-file-operations.h'
--- libcore/marlin-file-operations.h	2015-01-07 09:11:24 +0000
+++ libcore/marlin-file-operations.h	2015-02-07 19:01:29 +0000
@@ -33,7 +33,8 @@
 typedef void (* MarlinCreateCallback)    (GFile      *new_file,
                                           gpointer    callback_data);
 typedef void (* MarlinOpCallback)        (gpointer    callback_data);
-typedef void (* MarlinDeleteCallback)    (gboolean    user_cancel, gpointer    callback_data);
+typedef void (* MarlinDeleteCallback)    (gboolean    user_cancel,
+                                          gpointer    callback_data);
 typedef void (* MarlinMountCallback)     (GVolume    *volume,
                                           GObject    *callback_data_object);
 typedef void (* MarlinUnmountCallback)   (gpointer    callback_data);
@@ -130,7 +131,7 @@
                                          GFile                  *target_dir,
                                          GdkDragAction          copy_action,
                                          GtkWidget              *parent_view,
-                                         gpointer               done_callback,
+                                         GCallback              done_callback,
                                          gpointer               done_callback_data);
 
 void marlin_file_operations_move      (GList                *files,

=== modified file 'libcore/marlin-trash-monitor.c'
--- libcore/marlin-trash-monitor.c	2013-12-28 12:07:41 +0000
+++ libcore/marlin-trash-monitor.c	2015-02-07 19:01:29 +0000
@@ -131,7 +131,6 @@
 schedule_update_info (MarlinTrashMonitor *trash_monitor)
 {
     GFile *location;
-
     location = g_file_new_for_uri (MARLIN_TRASH_URI);
 
     g_file_query_info_async (location,
@@ -150,7 +149,6 @@
               gpointer user_data)
 {
     MarlinTrashMonitor *trash_monitor;
-
     trash_monitor = MARLIN_TRASH_MONITOR (user_data);
 
     schedule_update_info (trash_monitor);

=== modified file 'libcore/marlin-undostack-manager.c'
--- libcore/marlin-undostack-manager.c	2013-08-10 20:20:23 +0000
+++ libcore/marlin-undostack-manager.c	2015-02-07 19:01:29 +0000
@@ -185,8 +185,7 @@
 static void undo_redo_done_rename_callback (GOFFile * file,
                                             GFile * result_location, GError * error, gpointer callback_data);
 
-static void undo_redo_done_delete_callback (GHashTable *debuting_uris,
-                                            gboolean user_cancel, gpointer callback_data);
+static void undo_redo_done_delete_callback (gboolean user_cancel, gpointer callback_data);
 
 static void undo_redo_done_create_callback (GFile * new_file,
                                             gpointer callback_data);
@@ -402,7 +401,8 @@
 void
 marlin_undo_manager_redo (MarlinUndoManager *manager,
                           GtkWidget *parent_view,
-                          MarlinUndoFinishCallback cb)
+                          MarlinUndoFinishCallback cb,
+                          gpointer callback_data)
 {
     GList *uris;
     GOFFile *file;
@@ -486,8 +486,6 @@
             g_object_unref (fparent);
             break;
         case MARLIN_UNDO_MOVETOTRASH:
-            //amtest
-            //printf ("MARLIN_UNDO_MOVETRASH\n");
             if (g_hash_table_size (action->trashed) > 0) {
                 GList *uri_to_trash = g_hash_table_get_keys (action->trashed);
                 uris = uri_list_to_gfile_list (uri_to_trash);
@@ -553,7 +551,8 @@
 void
 marlin_undo_manager_undo (MarlinUndoManager *manager,
                           GtkWidget *parent_view,
-                          MarlinUndoFinishCallback cb)
+                          MarlinUndoFinishCallback cb,
+                          gpointer done_callback_data)
 {
     GList *uris = NULL;
     GHashTable *files_to_restore;
@@ -828,7 +827,6 @@
 {
     GFileInfo *info;
     guint64 mtime;
-
     info = g_file_query_info (file, G_FILE_ATTRIBUTE_TIME_MODIFIED,
                               G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, FALSE, NULL);
     if (info == NULL) {
@@ -1731,10 +1729,9 @@
 
 /** ---------------------------------------------------------------- */
 static void
-undo_redo_done_delete_callback (GHashTable *
-                                debuting_uris, gboolean user_cancel, gpointer callback_data)
+undo_redo_done_delete_callback (gboolean user_cancel, gpointer callback_data)
 {
-    undo_redo_done_transfer_callback (debuting_uris, callback_data);
+    undo_redo_done_transfer_callback (NULL, callback_data);
 }
 
 /** ---------------------------------------------------------------- */

=== modified file 'libcore/marlin-undostack-manager.h'
--- libcore/marlin-undostack-manager.h	2013-08-10 20:20:23 +0000
+++ libcore/marlin-undostack-manager.h	2015-02-07 19:01:29 +0000
@@ -108,11 +108,11 @@
 
 void
 marlin_undo_manager_undo (MarlinUndoManager* manager,
-                          GtkWidget *parent_view, MarlinUndoFinishCallback cb);
+                          GtkWidget *parent_view, MarlinUndoFinishCallback cb, gpointer done_callback_data);
 
 void
 marlin_undo_manager_redo (MarlinUndoManager* manager,
-                          GtkWidget *parent_view, MarlinUndoFinishCallback cb);
+                          GtkWidget *parent_view, MarlinUndoFinishCallback cb, gpointer done_callback_data);
 
 MarlinUndoActionData*
 marlin_undo_manager_data_new (MarlinUndoActionType type,

=== modified file 'libcore/pantheon-files-core-C.vapi'
--- libcore/pantheon-files-core-C.vapi	2015-01-16 18:08:07 +0000
+++ libcore/pantheon-files-core-C.vapi	2015-02-07 19:01:29 +0000
@@ -59,7 +59,7 @@
         static unowned GLib.List<unowned GLib.File> get_trash_dirs_for_mount (GLib.Mount mount);
         static void empty_trash_dirs (Gtk.Window? parent_window, owned GLib.List<GLib.File> dirs);
         static void empty_trash (Gtk.Widget? widget);
-        static void copy_move (GLib.List<GLib.File> files, void* relative_item_points, GLib.File target_dir, Gdk.DragAction copy_action, Gtk.Widget? parent_view = null, void* done_callback = null, void* done_callback_data = null);
+        static void copy_move (GLib.List<GLib.File> files, void* relative_item_points, GLib.File target_dir, Gdk.DragAction copy_action, Gtk.Widget? parent_view = null, GLib.Callback? done_callback = null, void* done_callback_data = null);
         static void new_file (Gtk.Widget parent_view, Gdk.Point? target_point, string parent_dir, string? target_filename, string? initial_contents, int length, Marlin.CreateCallback? create_callback = null, void* done_callback_data = null);
         static void new_file_from_template (Gtk.Widget parent_view, Gdk.Point? target_point, GLib.File parent_dir, string? target_filename, GLib.File template, Marlin.CreateCallback? create_callback = null, void* done_callback_data = null);
     }
@@ -70,7 +70,7 @@
     [CCode (cheader_filename = "marlin-file-operations.h", has_target = false)]
     public delegate void CreateCallback (GLib.File new_file, void* callback_data);
     [CCode (cheader_filename = "marlin-file-operations.h", has_target = false)]
-    public delegate void CopyCallBack (GLib.HashTable<GLib.File, void*> debuting_uris, void* pointer);
+    public delegate void CopyCallback (GLib.HashTable<GLib.File, void*> debuting_uris, void* pointer);
     [CCode (cheader_filename = "marlin-file-operations.h", has_target = false)]
     public delegate void DeleteCallback (bool user_cancel, void* callback_data);
 }
@@ -102,8 +102,8 @@
 
 [CCode (cprefix = "Eel", lower_case_cprefix = "eel_", cheader_filename = "eel-stock-dialogs.h")]
 namespace Eel {
-    public Gtk.Dialog show_warning_dialog (string primary_text, string secondary_text, Gtk.Window? parent);
-    public Gtk.Dialog show_error_dialog (string primary_text, string secondary_text, Gtk.Window? parent);
+    public unowned Gtk.Dialog show_warning_dialog (string primary_text, string secondary_text, Gtk.Window? parent);
+    public unowned Gtk.Dialog show_error_dialog (string primary_text, string secondary_text, Gtk.Window? parent);
 }
 
 [CCode (cprefix = "Eel", lower_case_cprefix = "eel_", cheader_filename = "eel-fcts.h")]
@@ -161,19 +161,17 @@
     }
 
     [CCode (cheader_filename = "marlin-undostack-manager.h")]
-    public delegate void UndoFinishCallback (UndoManager manager, Gtk.Widget? w);
-    /*public delegate void UndoFinishCallback (void *data);*/
-    /*public delegate void UndoFinishCallback ();*/
+    public delegate void UndoFinishCallback (void *data);
 
     [CCode (cheader_filename = "marlin-undostack-manager.h")]
-    public abstract class UndoManager : GLib.Object
+    public class UndoManager : GLib.Object
     {
         public static UndoManager instance ();
 
         public signal void request_menu_update (UndoMenuData data);
 
-        public void undo (UndoFinishCallback? cb);
-        public void redo (UndoFinishCallback? cb);
+        public void undo (Gtk.Widget widget, UndoFinishCallback? cb);
+        public void redo (Gtk.Widget widget, UndoFinishCallback? cb);
     }
 
     [CCode (cheader_filename = "marlin-progress-info.h")]
@@ -232,14 +230,16 @@
 
         public File(GLib.File location, GLib.File? dir);
         public static GOF.File @get(GLib.File location);
-        public static GOF.File get_by_uri (string uri);
+        public static GOF.File? get_by_uri (string uri);
         public static File cache_lookup (GLib.File file);
         public static bool launch_files (GLib.List<GOF.File> files, Gdk.Screen screen, GLib.AppInfo app);
         public static void list_free (GLib.List<GOF.File> files);
+        public static GLib.Mount? get_mount_at (GLib.File location);
 
         public void remove_from_caches ();
         public bool is_gone;
         public GLib.File location;
+        public GLib.File target_location;
         public GLib.File directory; /* parent directory location */
         public GLib.Icon? icon;
         public GLib.List<string>? emblems_list;
@@ -267,14 +267,17 @@
         public bool is_trashed();
         public bool is_writable ();
         public bool is_executable ();
+        public bool is_mountable ();
         public bool link_known_target;
+        public bool is_smb_share ();
+        public bool is_smb_server ();
         public uint flags;
 
         public Gdk.DragAction accepts_drop (GLib.List<GLib.File> file_list, Gdk.DragContext context, out Gdk.DragAction suggested_action_return);
 
         public unowned string get_display_name ();
         public unowned GLib.File get_target_location ();
-        public unowned string get_ftype ();
+        public unowned string? get_ftype ();
         public string? get_formated_time (string attr);
         public Gdk.Pixbuf get_icon_pixbuf (int size, bool forced_size, FileIconFlags flags);
         public void get_folder_icon_from_uri_or_path ();
@@ -290,7 +293,7 @@
         public bool has_permissions;
         public uint32 permissions;
 
-        public void open_single (Gdk.Screen screen, GLib.AppInfo app_info);
+        public void open_single (Gdk.Screen screen, GLib.AppInfo? app_info);
         public void update ();
         public void update_type ();
         public void update_icon (int size);
@@ -304,6 +307,7 @@
         public bool can_set_group ();
         public bool can_set_permissions ();
         public bool can_unmount ();
+        public GLib.Mount? mount;
         public string get_permissions_as_string ();
         public bool launch (Gdk.Screen screen, GLib.AppInfo app);
 
@@ -314,6 +318,7 @@
         public bool is_root_network_folder ();
         public bool is_network_uri_scheme ();
         public bool is_smb_uri_scheme ();
+        public bool is_connected;
 
         public unowned string get_display_target_uri ();
 

=== modified file 'libwidgets/LocationBar.vala'
--- libwidgets/LocationBar.vala	2015-01-26 10:59:26 +0000
+++ libwidgets/LocationBar.vala	2015-02-07 19:01:29 +0000
@@ -191,6 +191,7 @@
                 escape ();
                 return true;
         }
+
         return base.key_press_event (event);
     }
 
@@ -258,7 +259,7 @@
             var el = get_element_from_coordinates ((int) event.x, (int) event.y);
             if (el != null) {
                 selected = elements.index_of (el);
-                var newpath = sanitise_path (get_path_from_element (el));
+                var newpath = get_path_from_element (el);
                 path_changed (get_file_for_path (newpath));
             } else
                 grab_focus ();
@@ -351,20 +352,13 @@
         if (search_mode)
             set_entry_text ("");
         else {
-            current_path = sanitise_path (GLib.Uri.unescape_string (get_elements_path ()));
-            set_entry_text (current_path);
+            set_entry_text (GLib.Uri.unescape_string (get_elements_path ()));
             show_navigate_icon ();
         }
+
         return base.focus_in_event (event);
     }
 
-    string sanitise_path (string path) {
-        return path.replace ("file:////", "/")
-                   .replace ("file:///", "/")
-                   .replace ("trash:///", "")
-                   .replace ("network:///", "");
-    }
-    
     void on_grab_focus () {
         select_region (0, 0);
         set_position (-1);
@@ -488,15 +482,25 @@
         return null;
     }
 
-    protected string get_path_from_element (BreadcrumbsElement el) {
-        string newpath = protocol;
+    protected string get_path_from_element (BreadcrumbsElement? el) {
+        /* return path up to the speficied element or, if the parameter is null, the whole path */
+        string newpath = "";
+        bool first = true;
 
         foreach (BreadcrumbsElement element in elements) {
-            if (element.display) {
-                newpath += element.text + "/";
-                if (element == el)
+                string s = element.text;
+                if (first) {
+                    if (s == "" || s == "file://")
+                        newpath = "/";
+                    else
+                        newpath = s;
+
+                    first = false;
+                } else
+                    newpath += (s + "/");
+
+                if (el != null && element == el)
                     break;
-            }
         }
         return newpath;
     }
@@ -505,20 +509,13 @@
      * Get the current path of the PathBar, based on the elements that it contains
      **/
     public string get_elements_path () {
-        string strpath = "";
-        strpath = protocol;
-
-        foreach (BreadcrumbsElement element in elements) {
-            if (element.display)
-                strpath += element.text + "/";
-        }
-        return strpath;
+        return get_path_from_element (null);
     }
     
     /**
      * Gets a properly escaped GLib.File for the given path
      **/
-    public File get_file_for_path (string path) {
+    public File? get_file_for_path (string path) {
         string reserved_chars = (GLib.Uri.RESERVED_CHARS_GENERIC_DELIMITERS + GLib.Uri.RESERVED_CHARS_SUBCOMPONENT_DELIMITERS + " ").replace("#", "");
         string newpath = GLib.Uri.unescape_string (path ?? "");
 
@@ -529,12 +526,22 @@
         if (newpath[0] == '~')
             newpath = newpath.replace("~", Environment.get_home_dir ());
 
-        if (!newpath.contains("://"))
+        if (!newpath.contains("://")) {
+            if (!newpath.has_prefix ("/"))
+                newpath = "/" + newpath;
+
             newpath = Marlin.ROOT_FS_URI + newpath;
-        
+        } else {
+            string [] parts = newpath.split ("://", 3);
+            if (parts.length > 2) {
+                warning ("Invalid path");
+                return null;
+            }
+        }
+
         newpath = newpath.replace("ssh:", "sftp:");
         newpath = GLib.Uri.escape_string (newpath, reserved_chars, true);
-        
+
         File file = File.new_for_commandline_arg (newpath);
         return file;
     }
@@ -566,24 +573,21 @@
             load_right_click_menu (menu_x_root, menu_y_root);
             return true;
         }
-
         return false;
     }    
 
     public virtual string? update_breadcrumbs (string newpath, string breadpath) {
         string strloc;
 
-        if (Posix.strncmp (newpath, "./", 2) == 0) {
+        if (Posix.strncmp (newpath, "./", 2) == 0)
             return null;
-        }
 
-        if (newpath[0] == '/') {
+        if (newpath[0] == '/')
             strloc = newpath;
-        } else if (Posix.strncmp (newpath, "~/", 2) == 0) {
+        else if (Posix.strncmp (newpath, "~/", 2) == 0)
             strloc = Environment.get_home_dir ();
-        } else {
+        else
             strloc = breadpath + newpath;
-        }
 
         return strloc;
     }
@@ -608,10 +612,9 @@
         selected = -1;
         var breads = current_path.split ("/");
         var newelements = new Gee.ArrayList<BreadcrumbsElement> ();
-        if (breads.length == 0 || breads[0] == "") {
-            var element = new BreadcrumbsElement (protocol, left_padding, right_padding);
-            newelements.add (element);
-        }
+
+        string s = protocol == Marlin.ROOT_FS_URI ? "" : protocol;
+        newelements.add (new BreadcrumbsElement (s, left_padding, right_padding));
 
 
         /* Add every mounted volume in our IconDirectory in order to load them properly in the pathbar if needed */
@@ -633,17 +636,11 @@
         }
 
         foreach (string dir in breads) {
-            if (dir != "") {
-                var element = new BreadcrumbsElement (dir, left_padding, right_padding);
-                newelements.add (element);
-            }
+            if (dir != "")
+                newelements.add (new BreadcrumbsElement (dir, left_padding, right_padding));
         }
 
-        if (protocol == Marlin.ROOT_FS_URI)
-            newelements[0].text = "/";
-
         int max_path = int.min (elements.size, newelements.size);
-
         foreach (IconDirectory icon in icons) {
             if (icon.protocol && icon.path == protocol) {
                 newelements[0].set_icon(icon.icon);
@@ -653,7 +650,7 @@
                 bool found = true;
                 int h = 0;
 
-                for (int i = 0; i < icon.exploded.length; i++) {
+                for (int i = 1; i < icon.exploded.length; i++) {
                     if (icon.exploded[i] != newelements[i].text) {
                         found = false;
                         break;
@@ -670,10 +667,9 @@
                     newelements[h].display_text = (icon.text_displayed != null) || !icon.break_loop;
                     newelements[h].text_displayed = icon.text_displayed;
 
-                    if (icon.break_loop) {
-                        newelements[h].text = icon.path;
+                    if (icon.break_loop)
                         break;
-                    }
+
                 }
             }
         }

=== modified file 'plugins/contractor/plugin.vala'
--- plugins/contractor/plugin.vala	2013-05-12 05:49:12 +0000
+++ plugins/contractor/plugin.vala	2015-02-07 19:01:29 +0000
@@ -73,11 +73,14 @@
             } else {
                 files = get_file_array (gof_files);
                 var mimetypes = get_mimetypes (gof_files);
-                contracts = Granite.Services.ContractorProxy.get_contracts_by_mimelist (mimetypes);
+                if (mimetypes.length > 0)
+                    contracts = Granite.Services.ContractorProxy.get_contracts_by_mimelist (mimetypes);
             }
 
             assert (files != null);
-            assert (contracts != null);
+
+            if (contracts == null)
+                return;
 
             for (int i = 0; i < contracts.size; i++) {
                 var contract = contracts.get (i);

=== modified file 'plugins/network-places/plugin.vala'
--- plugins/network-places/plugin.vala	2014-10-29 18:55:55 +0000
+++ plugins/network-places/plugin.vala	2015-02-07 19:01:29 +0000
@@ -17,35 +17,9 @@
 // See src/marlin-connect-server-dialog.c
 extern void marlin_connect_server_dialog_show (Gtk.Widget widget);
 
-public class Files.Plugins.NetworkInfobar : Gtk.InfoBar {
-    public NetworkInfobar () {
-        message_type = Gtk.MessageType.INFO;
-        add_button (_("Connect to Server…"), 0);
-    }
-
-    public override void response (int response_id) {
-        marlin_connect_server_dialog_show (this);
-    }
-}
-
 public class Files.Plugins.NetworkPlaces : Marlin.Plugins.Base {
-    private NetworkInfobar? infobar = null;
 
     public override void directory_loaded (void* user_data) {
-        var file = ((Object[]) user_data)[2] as GOF.File;
-
-        if (file.is_network_uri_scheme ()) {
-            if (infobar == null) {
-                var slot = ((Object[]) user_data)[1] as GOF.AbstractSlot;
-                return_if_fail (slot != null);
-                infobar = new NetworkInfobar ();
-                slot.add_extra_widget (infobar);
-                infobar.show_all ();
-            }
-        }  else if (infobar != null) {
-            infobar.destroy ();
-            infobar = null;
-        }
     }
 
     public override void update_sidebar (Gtk.Widget widget) {

=== modified file 'plugins/pantheon-files-trash/plugin.vala'
--- plugins/pantheon-files-trash/plugin.vala	2014-12-10 13:19:17 +0000
+++ plugins/pantheon-files-trash/plugin.vala	2015-02-07 19:01:29 +0000
@@ -49,7 +49,6 @@
         if (file.location.get_uri_scheme () == "trash") {
             /* Only add infobar once */
             if (!infobars.has_key (slot)) {
-
                 var infobar = new Gtk.InfoBar ();
                 (infobar.get_content_area () as Gtk.Box).add (new Gtk.Label (_("These items may be deleted by emptying the trash.")));
                 infobar.add_button (_("Empty the Trash"), 0);
@@ -58,10 +57,11 @@
                 });
                 infobar.set_message_type (Gtk.MessageType.INFO);
                 infobar.set_response_sensitive (0, !TrashMonitor.is_empty ());
-                slot.add_extra_widget (infobar);
                 infobar.show_all ();
                 infobar.set_visible (!TrashMonitor.is_empty ());
+                slot.add_extra_widget (infobar);
                 infobars.@set (slot, infobar);
+
             }
         } else {
             var infobar = infobars.@get (slot);

=== modified file 'src/Application.vala'
--- src/Application.vala	2014-12-19 16:24:10 +0000
+++ src/Application.vala	2015-02-07 19:01:29 +0000
@@ -234,6 +234,19 @@
         });
     }
 
+    public void tab_reloaded (Marlin.View.Window source, GLib.File file) {
+        unowned List<Gtk.Window> window_list = this.get_windows ();
+        window_list.@foreach ((window) => {
+            var win = (Marlin.View.Window)window;
+
+            if ((source.window_number != win.window_number) &&
+                 file.equal (win.current_tab.get_current_slot ().location))
+
+                win.current_tab.reload (false);
+
+        });
+    }
+
     private void mount_removed_callback (VolumeMonitor monitor, Mount mount) {
         /* Notify each window */
         foreach (var window in this.get_windows ()) {

=== modified file 'src/BookmarkList.vala'
--- src/BookmarkList.vala	2014-11-13 20:24:33 +0000
+++ src/BookmarkList.vala	2015-02-07 19:01:29 +0000
@@ -83,13 +83,13 @@
             return instance;
         }
 
-        public void insert_uri (string uri, uint index) {
-            insert_item_internal (new Bookmark.from_uri (uri, null), index);
+        public void insert_uri (string uri, uint index, string? label = null) {
+            insert_item_internal (new Bookmark.from_uri (uri, label), index);
             save_bookmarks_file ();
         }
 
-        public void insert_uri_at_end (string uri) {
-            append_internal (new Bookmark.from_uri (uri, null));
+        public void insert_uri_at_end (string uri, string? label = null) {
+            append_internal (new Bookmark.from_uri (uri, label));
             save_bookmarks_file ();
         }
 

=== modified file 'src/DndHandler.vala'
--- src/DndHandler.vala	2014-11-13 20:24:33 +0000
+++ src/DndHandler.vala	2015-02-07 19:01:29 +0000
@@ -38,7 +38,7 @@
                                                  drop_target.get_target_location (),
                                                  action,
                                                  widget,
-                                                 (void*)dnd_done,
+                                                 null,
                                                  null);
                 return true;
             } else if (drop_target.is_executable ()) {
@@ -54,8 +54,6 @@
             return false;
         }
 
-        private void dnd_done (GLib.List<GLib.File> files, void* data) {}
-
         public Gdk.DragAction? drag_drop_action_ask (Gtk.Widget dest_widget,
                                                       Gtk.ApplicationWindow win,
                                                       Gdk.DragAction possible_actions) {

=== modified file 'src/MimeActions.vala'
--- src/MimeActions.vala	2014-11-13 20:24:33 +0000
+++ src/MimeActions.vala	2015-02-07 19:01:29 +0000
@@ -76,8 +76,11 @@
     }
 
     public static List<AppInfo>? get_applications_for_file (GOF.File file) {
+        string? type = file.get_ftype ();
+        if (type == null)
+            return null;
 
-        List<AppInfo> result = AppInfo.get_all_for_type (file.get_ftype ());
+        List<AppInfo> result = AppInfo.get_all_for_type (type);
         string uri_scheme = file.location.get_uri_scheme ();
 
         if (uri_scheme != null) {
@@ -142,11 +145,12 @@
 
             if (result != null)
                 result = intersect_application_lists (result, one_result);
+
             else
                 result = one_result.copy ();
 
             if (result == null)
-                break;
+                return null;
 
             previous_file = file;
         }
@@ -186,12 +190,11 @@
     }
 
     private static void filter_non_uri_apps (List<AppInfo> apps) {
-        var non_uri_apps = new List<AppInfo> ();
+         List<AppInfo> non_uri_apps = null;
 
         foreach (var app in apps) {
-            if (!app.supports_uris ()) {
+            if (!app.supports_uris ())
                 non_uri_apps.append (app);
-            }
         }
 
         foreach (var app in non_uri_apps) {

=== modified file 'src/MultiLineEditableLabel.vala'
--- src/MultiLineEditableLabel.vala	2014-12-25 08:43:14 +0000
+++ src/MultiLineEditableLabel.vala	2015-02-07 19:01:29 +0000
@@ -26,6 +26,9 @@
 
         public override Gtk.Widget create_editable_widget () {
             textview = new Gtk.TextView ();
+            /* Block propagation of button press event to view as this would cause renaming to end */
+            textview.button_press_event.connect_after (() => {return true;});
+
             scrolled_window = new Gtk.ScrolledWindow (null, null);
             scrolled_window.add (textview);
             return scrolled_window as Gtk.Widget;

=== modified file 'src/View/AbstractDirectoryView.vala'
--- src/View/AbstractDirectoryView.vala	2015-01-28 09:05:34 +0000
+++ src/View/AbstractDirectoryView.vala	2015-02-07 19:01:29 +0000
@@ -198,7 +198,7 @@
         private GLib.AppInfo default_app;
         private Gtk.TreePath? hover_path = null;
 
-        private bool selection_was_removed = false;
+        private bool can_trash_or_delete = true;
 
         /* Rapid keyboard paste support */
         protected bool pasting_files = false;
@@ -211,6 +211,7 @@
         private bool updates_frozen = false;
         protected bool tree_frozen = false;
         private bool in_trash = false;
+        private bool in_network_root = false;
         protected bool is_loading;
         protected bool helpers_shown;
         private uint select_timeout_id = 0;
@@ -429,12 +430,13 @@
 
         protected void unfreeze_updates () {
             updates_frozen = false;
-            slot.directory.freeze_update = false;;
+            slot.directory.freeze_update = false;
             update_menu_actions ();
             size_allocate.connect (on_size_allocate);
             clipboard.changed.connect (on_clipboard_changed);
             view.enter_notify_event.connect (on_enter_notify_event);
             view.key_press_event.connect (on_view_key_press_event);
+
         }
 
         public new void grab_focus () {
@@ -481,21 +483,27 @@
                 return;
 
             unowned Gdk.Screen screen = Eel.gtk_widget_get_screen (this);
-            bool only_folders = selection_only_contains_folders (selection);
-
-            if (nb_elem < 10 && (default_app == null || only_folders)) {
+
+            if (nb_elem == 1) {
+                activate_file (selection.data, screen, flag, true);
+                return;
+            }
+
+            if (nb_elem < 10 && (default_app == null)) {
                 /* launch each selected file individually ignoring selections greater than 10 */
-                bool only_one_file = (nb_elem == 1);
-
                 foreach (unowned GOF.File file in selection) {
                     /* Prevent too rapid activation of files - causes New Tab to crash for example */
-                    GLib.Timeout.add (50, () => {
-                        activate_file (file, screen, flag, only_one_file);
-                        return false;
-                    });
+                    if (file.is_folder ()) {
+                        GLib.Timeout.add (50, () => {
+                            activate_file (file, screen, flag, false);
+                            return false;
+                        });
+                    } else
+                        file.open_single (screen, null);
                 }
-            } else if (default_app != null)
+            } else if (default_app != null) {
                 open_files_with (default_app, selection);
+            }
         }
 
         protected void preview_selected_items () {
@@ -582,13 +590,12 @@
             loaded_subdirectories = null;
             model.clear ();
             unblock_model ();
-
-            connect_directory_handlers (new_dir);
-            update_menu_actions ();
-            model.set_sort_column_id (slot.directory.file.sort_column_id, slot.directory.file.sort_order);
+            if (new_dir.can_load);
+                connect_directory_handlers (new_dir);
         }
 
         public void reload () {
+            slot.directory.clear_directory_info ();
             change_directory (slot.directory, slot.directory);
         }
 
@@ -631,7 +638,7 @@
             bool only_folders = true;
 
             list.@foreach ((file) => {
-                if (!file.is_folder ())
+                if (!(file.is_folder () || file.is_root_network_folder ()))
                     only_folders = false;
             });
 
@@ -700,13 +707,16 @@
             if (updates_frozen || in_trash)
                 return;
 
-            debug ("activate file %s  only one file %s", file.uri, only_one_file.to_string ());
-            GLib.File location = file.location.dup ();
-
+            GLib.File location = file.get_target_location ();
             if (screen == null)
                 screen = Eel.gtk_widget_get_screen (this);
 
-            if (file.is_folder ()) {
+            default_app = Marlin.MimeActions.get_default_application_for_file (file);
+
+            if (file.is_folder () ||
+                file.get_ftype () == "inode/directory" ||
+                file.is_root_network_folder ()) {
+
                 switch (flag) {
                     case Marlin.OpenFlag.NEW_TAB:
                         window.add_tab (location, Marlin.ViewMode.CURRENT);
@@ -729,25 +739,27 @@
             else if (only_one_file && default_app != null)
                 file.open_single (screen, default_app);
             else
-                warning ("Unable to activate this file.  Default app is %s", default_app != null ? default_app.get_name () : "null");
+                warning ("Unable to activate this file.  Default app is %s",
+                         default_app != null ? default_app.get_name () : "null");
         }
 
         private void trash_or_delete_files (GLib.List<unowned GOF.File> file_list,
                                             bool delete_if_already_in_trash,
                                             bool delete_immediately) {
+
             GLib.List<GLib.File> locations = null;
-
             file_list.@foreach ((file) => {
                 locations.prepend (file.location);
             });
 
             if (locations != null) {
                 locations.reverse ();
+
                 if (delete_immediately)
-                    Marlin.FileOperations.delete (locations,
-                                                  window as Gtk.Window,
-                                                  after_trash_or_delete,
-                                                  this);
+                    Marlin.FileOperations.@delete (locations,
+                                                   window as Gtk.Window,
+                                                   after_trash_or_delete,
+                                                   this);
                 else
                     Marlin.FileOperations.trash_or_delete (locations,
                                                            window as Gtk.Window,
@@ -787,7 +799,10 @@
             unselect_all ();
             select_gof_file (file_to_rename);
 
-            if (file_to_rename.is_writable ())
+            /* Assume writability on remote locations
+             * TODO Reliably determine writability with various remote protocols.
+             */
+            if (file_to_rename.is_writable () || !slot.directory.is_local)
                 start_renaming_file (file_to_rename, false);
             else
                 warning ("You do not have permission to rename this file");
@@ -801,17 +816,32 @@
 
             var view = (FM.AbstractDirectoryView)data;
             var file_to_rename = GOF.File.@get (new_file);
-            /* Allow time for the file to appear in the tree model before renaming */
-            GLib.Timeout.add (250, () => {
+            bool local = view.slot.directory.is_local;
+            if (!local)
+                view.slot.directory.need_reload ();
+
+            /* Allow time for the file to appear in the tree model before renaming
+             * Wait longer for remote locations to allow for reload.
+             * TODO: Remove need for hard coded delay. 
+             */
+            int delay = local ? 250 : 500;
+            GLib.Timeout.add (delay, () => {
                 view.rename_file (file_to_rename);
                 view.slot.directory.unblock_monitor ();
                 return false;
             });
         }
 
-        public static void after_trash_or_delete (bool user_cancel, void* callback_data) {
-            FM.AbstractDirectoryView view = (FM.AbstractDirectoryView)callback_data;
-                view.selection_was_removed = false;
+        /** Must pass a pointer to an instance of FM.AbstractDirectoryView as 3rd parameter when
+          * using this callback */ 
+        public static void after_trash_or_delete (bool user_cancel, void* data) {
+            var view = data as FM.AbstractDirectoryView;
+            assert (view is FM.AbstractDirectoryView);
+
+            view.can_trash_or_delete = true;
+
+            if (!view.slot.directory.is_local)
+                view.slot.directory.need_reload ();
         }
 
         private void trash_or_delete_selected_files (bool delete_immediately = false) {
@@ -819,16 +849,32 @@
          * when using keybindings. So we remember if the current selection
          * was already removed (but the view doesn't know about it yet).
          */
-            if (selection_was_removed)
+            if (!can_trash_or_delete)
                 return;
 
             unowned GLib.List<unowned GOF.File> selection = get_selected_files_for_transfer ();
             if (selection != null) {
+                can_trash_or_delete = false;
+
                 trash_or_delete_files (selection, true, delete_immediately);
-                selection_was_removed = true;
             }
         }
 
+        private void delete_selected_files () {
+            unowned GLib.List<unowned GOF.File> selection = get_selected_files_for_transfer ();
+            if (selection == null)
+                return;
+
+            GLib.List<GLib.File> locations = null;
+
+            selection.@foreach ((file) => {
+                locations.prepend (file.location);
+            });
+
+            locations.reverse ();
+            Marlin.FileOperations.@delete (locations, window as Gtk.Window, after_trash_or_delete, this);
+        }
+
 /** Signal Handlers */
 
     /** Menu actions */
@@ -920,10 +966,13 @@
         }
 
         private void on_common_action_bookmark (GLib.SimpleAction action, GLib.Variant? param) {
+            GLib.File location;
             if (selected_files != null)
-                window.sidebar.add_uri (selected_files.data.uri);
+                location = selected_files.data.get_target_location ();
             else
-                window.sidebar.add_uri (slot.directory.file.uri);
+                location = slot.directory.file.get_target_location ();
+
+                window.sidebar.add_uri (location.get_uri (), null);
         }
 
         /** Background actions */
@@ -1018,6 +1067,8 @@
         }
 
         public static void after_pasting_files (GLib.HashTable uris, void* pointer) {
+            assert (pointer != null);
+
             var view = pointer as FM.AbstractDirectoryView; 
             if (view.paste_timer == null)
                 view.paste_timer = new GLib.Timer ();
@@ -1051,14 +1102,27 @@
             var file = get_files_for_action ().nth_data (0);
 
             if (file != null && clipboard.get_can_paste ()) {
-                pasting_files = true;
-                prepare_to_select_added_files ();
-                /* Block the async directory file monitor to avoid generating unwanted "add-file" events */
-                slot.directory.block_monitor ();
+                GLib.File target;
+                GLib.Callback? call_back;
+
                 if (file.is_folder () && !clipboard.has_file (file))
-                    clipboard.paste_files (file.get_target_location (), this as Gtk.Widget, after_pasting_files);
+                    target = file.get_target_location ();
                 else
-                    clipboard.paste_files (slot.directory.location, this as Gtk.Widget, after_pasting_files);
+                    target = slot.location;
+
+                if (target.has_uri_scheme ("trash")) {
+                    /* Pasting files into trash is equivalent to trash or delete action */
+                    pasting_files = false; 
+                    call_back = (GLib.Callback)after_trash_or_delete;
+                } else {
+                    pasting_files = true;
+                    prepare_to_select_added_files ();
+                    /* Block the async directory file monitor to avoid generating unwanted "add-file" events */
+                    slot.directory.block_monitor ();
+                    call_back = (GLib.Callback)after_pasting_files;
+                }
+
+                clipboard.paste_files (target, this as Gtk.Widget, call_back);
             }
         }
 
@@ -1076,7 +1140,8 @@
             model.file_changed (file, dir);
             /* 2nd parameter is for returned request id if required - we do not use it? */
             /* This is required if we need to dequeue the request */
-            thumbnailer.queue_file (file, null, false);
+            if (slot.directory.is_local)
+                thumbnailer.queue_file (file, null, false);
         }
 
         private void on_directory_file_icon_changed (GOF.Directory.Async dir, GOF.File file) {
@@ -1098,8 +1163,12 @@
         private void  on_directory_done_loading (GOF.Directory.Async dir) {
             debug ("DV  directory done loading %s", dir.file.uri);
             dir.file_loaded.disconnect (on_directory_file_loaded);
-            in_trash = (dir.file.uri == Marlin.TRASH_URI); /* trash cannot be subdirectory */
+            in_trash = slot.directory.is_trash;
+            in_network_root = slot.directory.file.is_root_network_folder ();
             thaw_tree ();
+
+            model.set_sort_column_id (slot.directory.file.sort_column_id, slot.directory.file.sort_order);
+
             /* This is a workround for a bug (Gtk?) in the drawing of the ListView where the columns
              * are sometimes not properly aligned when first drawn, only after redrawing the view. */ 
             Idle.add (() => {
@@ -1117,7 +1186,7 @@
             model.set_property ("size", icon_size);
             change_zoom_level ();
 
-            if (get_realized ())
+            if (get_realized () && slot.directory.is_local)
                 load_thumbnails (slot.directory, zoom);
         }
 
@@ -1225,7 +1294,6 @@
 
 /** Handle clipboard signal */
         private void on_clipboard_changed () {
-            update_menu_actions ();
             /* show possible change in appearance of cut items */
             queue_draw ();
         }
@@ -1238,7 +1306,6 @@
             if (updates_frozen)
                 return;
 
-            update_menu_actions ();
             window.selection_changed (get_selected_files ());
         }
 
@@ -1274,7 +1341,7 @@
             GLib.StringBuilder sb = new GLib.StringBuilder ("");
 
             drag_file_list.@foreach ((file) => {
-                sb.append (file.uri);
+                sb.append (file.get_target_location ().get_uri ());
                 sb.append ("\n");
             });
 
@@ -1305,15 +1372,16 @@
                              int y,
                              uint timestamp) {
             /* if we don't have drop data already ... */
-            if (!drop_data_ready) {
-                get_drop_data (context, x, y, timestamp);
-            } else
+            if (!drop_data_ready && !get_drop_data (context, x, y, timestamp))
+                return false;
+            else
             /* We have the drop data - check whether we can drop here*/
                 check_destination_actions_and_target_file (context, x, y, timestamp);
 
             if (drag_scroll_timer_id == 0)
                 start_drag_scroll_timer (context);
 
+            Gdk.drag_status (context, current_suggested_action, timestamp);
             return true;
         }
 
@@ -1376,6 +1444,12 @@
             if (drop_occurred) {
                 drop_occurred = false;
                 if (current_actions != Gdk.DragAction.DEFAULT) {
+                    if (!slot.directory.is_local) {
+                        /* Cannot be sure that view will automatically refresh properly
+                         * so we force a refresh after a short delay */ 
+                        slot.directory.clear_directory_info ();
+                        slot.directory.need_reload (); 
+                    }
                     switch (info) {
                         case TargetType.XDND_DIRECT_SAVE0:
                             success = dnd_handler.handle_xdnddirectsave  (context,
@@ -1392,6 +1466,7 @@
                         case TargetType.TEXT_URI_LIST:
                             if ((current_actions & file_drag_actions) != 0) {
                                 prepare_to_select_added_files ();
+
                                 success = dnd_handler.handle_file_drag_actions  (get_real_view (),
                                                                                  window,
                                                                                  context,
@@ -1464,7 +1539,7 @@
             return file;
         }   
 
-        private void get_drop_data (Gdk.DragContext context, int x, int y, uint timestamp) {
+        private bool get_drop_data (Gdk.DragContext context, int x, int y, uint timestamp) {
             Gdk.DragAction action = Gdk.DragAction.DEFAULT;
             Gtk.TargetList? list = null;
             Gdk.Atom target = Gtk.drag_dest_find_target (get_real_view (), context, list);
@@ -1497,9 +1572,10 @@
             } else if (target != Gdk.Atom.NONE)
                 /* request the drag data from the source */
                 Gtk.drag_get_data (get_real_view (), context, target, timestamp); /* emits "drag_data_received" */
+            else
+                return false;
 
-            /* tell Gdk whether we can drop here */
-            Gdk.drag_status (context, action, timestamp);
+            return true;
         }
 
         private void check_destination_actions_and_target_file (Gdk.DragContext context, int x, int y, uint timestamp) {
@@ -1508,13 +1584,16 @@
             string uri = file != null ? file.uri : "";
             string current_uri = drop_target_file != null ? drop_target_file.uri : "";
 
+            Gdk.drag_status (context, Gdk.DragAction.MOVE, timestamp);
             if (uri != current_uri) {
                 drop_target_file = file;
                 current_actions = Gdk.DragAction.DEFAULT;
                 current_suggested_action = Gdk.DragAction.DEFAULT;
+
                 if (file != null) {
                     current_actions = file.accepts_drop (drop_file_list, context, out current_suggested_action);
                     highlight_drop_file (drop_target_file, current_actions, path);
+
                     if (file.is_folder () && drag_file_list.index (file) == -1) {
                         cancel_timeout (ref drag_enter_timer_id);
                         drag_enter_timer_id = GLib.Timeout.add_full (GLib.Priority.LOW,
@@ -1526,7 +1605,6 @@
                         });
                     }
                 }
-                Gdk.drag_status (context, current_suggested_action, timestamp);
             }
         }
 
@@ -1584,89 +1662,130 @@
 
         protected void show_context_menu (Gdk.Event event) {
             /* select selection or background context menu */
+            update_menu_actions ();
             var builder = new Gtk.Builder.from_file (Config.UI_DIR + "directory_view_popup.ui");
-            GLib.MenuModel? model;
+            GLib.MenuModel? model = null;
 
-            if (get_selected_files () != null) 
+            if (get_selected_files () != null)
                 model = build_menu_selection (ref builder, in_trash);
             else
                 model = build_menu_background (ref builder, in_trash);
 
-            if (model != null) {
+            if (model != null && model is GLib.MenuModel) {
                 /* add any additional entries from plugins */
                 var menu = new Gtk.Menu.from_model (model);
-                plugins.hook_context_menu (menu as Gtk.Widget, get_selected_files ());
+
+                if (!in_trash)
+                    plugins.hook_context_menu (menu as Gtk.Widget, get_selected_files ());
+
                 menu.set_screen (null);
                 menu.attach_to_widget (this, null);
                 Eel.pop_up_context_menu (menu,
                                          Eel.DEFAULT_POPUP_MENU_DISPLACEMENT,
                                          Eel.DEFAULT_POPUP_MENU_DISPLACEMENT,
                                          (Gdk.EventButton) event);
-            } else
-                warning ("Model is null");
+            }
+        }
+
+        private bool valid_selection_for_edit () {
+            foreach (GOF.File file in get_selected_files ()) {
+                if (file.is_root_network_folder ())
+                    return false;
+            }
+            return true;
         }
 
         private GLib.MenuModel? build_menu_selection (ref Gtk.Builder builder, bool in_trash) {
             GLib.Menu menu = new GLib.Menu ();
 
-            if (in_trash)
+            var clipboard_menu = builder.get_object ("clipboard-selection") as GLib.Menu;
+
+            if (in_trash) {
                 menu.append_section (null, builder.get_object ("popup-trash-selection") as GLib.Menu);
-            else {
-                menu.append_section (null, build_menu_open (ref builder));
 
-                var clipboard_menu = builder.get_object ("clipboard-selection") as GLib.Menu;
-                /* Do not display the 'Paste into' menuitem if selection is not a folder.
-                 * We have to hard-code the menuitem index so any change to the clipboard-
-                 * selection menu definition in directory_view_popup.ui may necessitate changing
-                 * the index below.
-                 */
-                if (!common_actions.get_action_enabled ("paste_into"))
-                    clipboard_menu.remove (2);
+                clipboard_menu.remove (1); /* Copy */
+                clipboard_menu.remove (1); /* Paste (index updated by previous line) */
 
                 menu.append_section (null, clipboard_menu);
-
-                menu.append_section (null, builder.get_object ("trash") as GLib.MenuModel);
-                menu.append_section (null, builder.get_object ("rename") as GLib.MenuModel);
+            } else {
+                var open_menu = build_menu_open (ref builder);
+                if (open_menu != null)
+                    menu.append_section (null, open_menu);
+
+                if (slot.directory.file.is_smb_server ()) {
+                    if (common_actions.get_action_enabled ("paste_into"))
+                        menu.append_section (null, builder.get_object ("paste") as GLib.MenuModel);
+                } else if (valid_selection_for_edit ()) {
+                    /* Do not display the 'Paste into' menuitem if selection is not a folder.
+                     * We have to hard-code the menuitem index so any change to the clipboard-
+                     * selection menu definition in directory_view_popup.ui may necessitate changing
+                     * the index below.
+                     */
+                    if (!common_actions.get_action_enabled ("paste_into"))
+                        clipboard_menu.remove (2);
+
+                    menu.append_section (null, clipboard_menu);
+
+                    if (slot.directory.has_trash_dirs)
+                        menu.append_section (null, builder.get_object ("trash") as GLib.MenuModel);
+                    else
+                        menu.append_section (null, builder.get_object ("delete") as GLib.MenuModel);
+
+                    menu.append_section (null, builder.get_object ("rename") as GLib.MenuModel);
+                }
 
                 if (common_actions.get_action_enabled ("bookmark"))
                     menu.append_section (null, builder.get_object ("bookmark") as GLib.MenuModel);
+
+                menu.append_section (null, builder.get_object ("properties") as GLib.MenuModel);
             }
-            menu.append_section (null, builder.get_object ("properties") as GLib.MenuModel);
+
             return menu as MenuModel;
         }
 
         private GLib.MenuModel? build_menu_background (ref Gtk.Builder builder, bool in_trash) {
-            if (in_trash)
-                return null;
+            if (in_trash) {
+                var menu = new GLib.Menu ();
+                if (common_actions.get_action_enabled ("paste_into")) {
+                    menu.append_section (null, builder.get_object ("paste") as GLib.MenuModel);
+
+                    return menu as MenuModel;
+                } else
+                    return null;
+            }
 
             var menu = new GLib.Menu ();
             menu.append_section (null, build_menu_open (ref builder));
 
-            if (common_actions.get_action_enabled ("paste_into"))
-                menu.append_section (null, builder.get_object ("paste") as GLib.MenuModel);
-
-
-            GLib.MenuModel? template_menu = build_menu_templates ();
-            var new_menu = builder.get_object ("new") as GLib.Menu;
-
-            if (template_menu != null) {
-                var new_submenu = builder.get_object ("new-submenu") as GLib.Menu;
-                new_submenu.append_section (null, template_menu);
+            if (!in_network_root) {
+                if (common_actions.get_action_enabled ("paste_into"))
+                    menu.append_section (null, builder.get_object ("paste") as GLib.MenuModel);
+
+                GLib.MenuModel? template_menu = build_menu_templates ();
+                var new_menu = builder.get_object ("new") as GLib.Menu;
+
+                if (template_menu != null) {
+                    var new_submenu = builder.get_object ("new-submenu") as GLib.Menu;
+                    new_submenu.append_section (null, template_menu);
+                }
+
+                menu.append_section (null, new_menu as GLib.MenuModel);
+
+                menu.append_section (null, builder.get_object ("sort-by") as GLib.MenuModel);
             }
 
-            menu.append_section (null, new_menu as GLib.MenuModel);
-            menu.append_section (null, builder.get_object ("sort-by") as GLib.MenuModel);
-
             if (common_actions.get_action_enabled ("bookmark"))
                 menu.append_section (null, builder.get_object ("bookmark") as GLib.MenuModel);
 
             menu.append_section (null, builder.get_object ("hidden") as GLib.MenuModel);
             menu.append_section (null, builder.get_object ("properties") as GLib.MenuModel);
+
             return menu as MenuModel;
         }
 
         private GLib.MenuModel build_menu_open (ref Gtk.Builder builder) {
             var menu = new GLib.Menu ();
+
             string label = _("Invalid");
             unowned GLib.List<unowned GOF.File> selection = get_files_for_action ();
             unowned GOF.File selected_file = selection.data;
@@ -1684,8 +1803,14 @@
 
             GLib.MenuModel? app_submenu = build_submenu_open_with_applications (ref builder, selection);
 
-            if (app_submenu != null)
-                menu.append_submenu (_("Open in"), app_submenu);
+            if (app_submenu != null && app_submenu.get_n_items () > 0) {
+                if (selected_file.is_folder () || selected_file.is_root_network_folder ())
+                    label =  _("Open in");
+                else
+                    label = _("Open with");
+
+                menu.append_submenu (label, app_submenu);
+            }
 
             return menu as MenuModel;
         }
@@ -1696,32 +1821,39 @@
             var open_with_submenu = new GLib.Menu ();
             int index = -1;
 
-            if (common_actions.get_action_enabled ("open_in"))
+            if (common_actions.get_action_enabled ("open_in")) {
                 open_with_submenu.append_section (null, builder.get_object ("open-in") as GLib.MenuModel);
 
+                if (!selection.data.is_mountable () && !selection.data.is_root_network_folder ())
+                    open_with_submenu.append_section (null, builder.get_object ("open-in-terminal") as GLib.MenuModel);
+                else
+                    return open_with_submenu;
+            }
+
             open_with_apps = Marlin.MimeActions.get_applications_for_files (selection);
             filter_default_app_from_open_with_apps ();
             filter_this_app_from_open_with_apps ();
 
-            if (open_with_apps.length () > 0) {
+            if (open_with_apps != null) {
                 var apps_section = new GLib.Menu ();
                 string last_label = "";
                 open_with_apps.@foreach ((app) => {
-                    var label = app.get_display_name ();
-
-                    /* The following mainly applies to Nautilus, whose display name is also "Files" */
-                    if (label == "Files") {
-                        label = app.get_executable ();
-                        label = label[0].toupper ().to_string () + label.substring (1);
-                    }
-
-                    /* Do no show same name twice - some apps have more than one .desktop file
-                     * with the same name (e.g. Nautilus)
-                     */       
-                    if (label != last_label) {
-                        index++;
-                        apps_section.append (label, "selection.open_with_app::" + index.to_string ());
-                        last_label = label.dup ();
+                    if (app != null && app is AppInfo) {
+                        var label = app.get_display_name ();
+                        /* The following mainly applies to Nautilus, whose display name is also "Files" */
+                        if (label == "Files") {
+                            label = app.get_executable ();
+                            label = label[0].toupper ().to_string () + label.substring (1);
+                        }
+
+                        /* Do not show same name twice - some apps have more than one .desktop file
+                         * with the same name (e.g. Nautilus)
+                         */       
+                        if (label != last_label) {
+                            index++;
+                            apps_section.append (label, "selection.open_with_app::" + index.to_string ());
+                            last_label = label.dup ();
+                        }
                     }
                 });
 
@@ -1781,21 +1913,26 @@
                 return;
 
             unowned GLib.List<unowned GOF.File> selection = get_files_for_action ();
+            unowned GOF.File file;
+
             uint selection_count = selection.length ();
             bool more_than_one_selected = (selection_count > 1);
-            bool single_folder = true; /* background is a folder */
+            bool single_folder = false;
             bool only_folders = selection_only_contains_folders (selection);
             bool can_rename = false;
 
             update_default_app (selection);
 
             if (selection_count > 0) {
-                unowned GOF.File? file = selection.data;
+                file = selection.data;
                 if (file != null) {
                     single_folder = (!more_than_one_selected && file.is_folder ());
                     can_rename = file.is_writable ();
                 } else
                     critical ("File in selection is null");
+            } else {
+                file = slot.directory.file;
+                single_folder = (!more_than_one_selected && file.is_folder ());
             }
 
             update_paste_action_enabled (single_folder);
@@ -1806,8 +1943,18 @@
             action_set_enabled (selection_actions, "rename", selection_count == 1 && can_rename);
             action_set_enabled (selection_actions, "open", selection_count == 1);
             action_set_enabled (selection_actions, "cut", selection_count > 0);
+            action_set_enabled (selection_actions, "trash", slot.directory.has_trash_dirs);
+
+            /* Both folder and file can be bookmarked if local, but only remote folders can be bookmarked
+             * because remote file bookmarks do not work correctly for unmounted locations */
+            bool can_bookmark = (!more_than_one_selected || single_folder) &&
+                                 (slot.directory.is_local ||
+                                 (file.get_ftype () != null && file.get_ftype () == "inode/directory") ||
+                                 file.is_smb_server ());
+
+            action_set_enabled (common_actions, "bookmark", can_bookmark);
             /* TODO inhibit copy for unreadable files see bug #1392465*/
-            action_set_enabled (common_actions, "copy", true); 
+            action_set_enabled (common_actions, "copy", !in_trash); 
             action_set_enabled (common_actions, "bookmark", !more_than_one_selected);
         }
 
@@ -1915,13 +2062,19 @@
             unowned GLib.List<AppInfo> l = open_with_apps;
 
             while (l != null) {
-                exec_name = l.data.get_executable ();
+                if (l.data is AppInfo) {
+                    exec_name = l.data.get_executable ();
 
-                if (exec_name != null && (exec_name == APP_NAME || exec_name == TERMINAL_NAME)) {
+                    if (exec_name != null && (exec_name == APP_NAME || exec_name == TERMINAL_NAME)) {
+                        open_with_apps.delete_link (l);
+                        break;
+                    }
+                } else {
                     open_with_apps.delete_link (l);
-                    break;
+                    l = open_with_apps;
+                    if (l == null)
+                        break;
                 }
-
                 l = l.next;
             }
         }
@@ -1936,7 +2089,7 @@
             if (id2 != null) {
                 unowned GLib.List<AppInfo> l = open_with_apps;
 
-                while (l != null) {
+                while (l != null && l.data is AppInfo) {
                     id1 = l.data.get_id ();
 
                     if (id1 != null && id1 == id2) {
@@ -1975,10 +2128,13 @@
              * all items have been added and we've perhaps scrolled to the file remembered
              * the last time */
 
-            if (thumbnail_source_id != 0 || !(slot is GOF.AbstractSlot) || slot.directory == null)
+            if (thumbnail_source_id != 0 ||
+                !(slot is GOF.AbstractSlot) ||
+                slot.directory == null ||
+                !slot.directory.is_local)
+
                 return;
 
-            cancel_thumbnailing ();
             thumbnail_source_id = GLib.Timeout.add (175, () => {
                 if (!(slot is GOF.AbstractSlot) || slot.directory == null)
                     return false;
@@ -1986,6 +2142,8 @@
                 if (slot.directory.is_loading ())
                     return true;
 
+                cancel_thumbnailing ();
+
                 /* compute visible item range */
                 Gtk.TreePath start_path, end_path, path;
                 Gtk.TreeIter iter;
@@ -2036,7 +2194,7 @@
         }
 
         private void load_thumbnails (GOF.Directory.Async dir, Marlin.ZoomLevel zoom) {
-            /* Async function checks dir is not loading */
+            /* Async function checks dir is not loading and dir is local */
             dir.queue_load_thumbnails (Marlin.zoom_level_to_icon_size (zoom));
         }
 
@@ -2143,6 +2301,7 @@
                 return;
 
             notify_selection_changed ();
+            update_menu_actions ();
         }
 
         protected virtual bool on_view_key_press_event (Gdk.EventKey event) {
@@ -2157,6 +2316,7 @@
             bool other_mod_pressed = (((mods & ~Gdk.ModifierType.SHIFT_MASK) & ~Gdk.ModifierType.CONTROL_MASK) != 0);
             bool only_control_pressed = control_pressed && !other_mod_pressed; /* Shift can be pressed */
             bool only_alt_pressed = alt_pressed && ((mods & ~Gdk.ModifierType.MOD1_MASK) == 0);
+            bool in_trash = slot.location.has_uri_scheme ("trash");
 
             switch (event.keyval) {
                 case Gdk.Key.F10:
@@ -2167,7 +2327,7 @@
                     break;
 
                 case Gdk.Key.F2:
-                    if (no_mods) {
+                    if (no_mods && selection_actions.get_action_enabled ("rename")) {
                         rename_selected_file ();
                         return true;
                     }
@@ -2176,17 +2336,21 @@
                 case Gdk.Key.Delete:
                 case Gdk.Key.KP_Delete:
                     if (no_mods) {
-                        trash_or_delete_selected_files (false);
+                        /* If already in trash, permanently delete the file */
+                        trash_or_delete_selected_files (in_trash);
                         return true;
                     } else if (only_shift_pressed) {
                         trash_or_delete_selected_files (true);
                         return true;
+                    } else if (only_shift_pressed && !renaming) {
+                        delete_selected_files ();
+                        return true;
                     }
                     break;
 
                 case Gdk.Key.space:
                     if (view_has_focus ()) {
-                        if (only_shift_pressed)
+                        if (only_shift_pressed  && !in_trash)
                             activate_selected_items (Marlin.OpenFlag.NEW_TAB);
                         else if (no_mods)
                             preview_selected_items ();
@@ -2199,7 +2363,9 @@
 
                 case Gdk.Key.Return:
                 case Gdk.Key.KP_Enter:
-                    if (only_shift_pressed)
+                    if (in_trash)
+                        return false;
+                    else if (only_shift_pressed)
                         activate_selected_items (Marlin.OpenFlag.NEW_TAB);
                     else if (no_mods)
                          activate_selected_items (Marlin.OpenFlag.DEFAULT);
@@ -2209,14 +2375,14 @@
                     return true;
 
                 case Gdk.Key.T:
-                    if (only_control_pressed) {
+                    if (only_control_pressed && !in_trash) {
                         open_selected_in_terminal ();
                         return true;
                     }
                     break;
 
                 case Gdk.Key.N:
-                    if (only_control_pressed) {
+                    if (only_control_pressed && !in_trash) {
                         activate_selected_items (Marlin.OpenFlag.NEW_TAB);
                         return true;
                     }
@@ -2224,7 +2390,16 @@
 
                 case Gdk.Key.c:
                     if (only_control_pressed) {
-                        common_actions.activate_action ("copy", null);
+                        /* Should not copy files in the trash - cut instead */
+                        if (in_trash) {
+                            Eel.show_warning_dialog (_("Cannot copy files that are in the trash"),
+                                                     _("Cutting the selection instead"),
+                                                     window as Gtk.Window);
+
+                            selection_actions.activate_action ("cut", null);
+                        } else
+                            common_actions.activate_action ("copy", null);
+
                         return true;
                     }
                     break;
@@ -2235,7 +2410,6 @@
                         action_set_enabled (common_actions, "paste_into", true);
                         unselect_all ();
                         common_actions.activate_action ("paste_into", null);
-                        update_menu_actions ();
                         return true;
                     }
                     break;
@@ -2331,8 +2505,15 @@
                 (path == null && hover_path != null) ||
                 (path != null && hover_path != null && path.compare (hover_path) != 0)) {
 
-                window.item_hovered (file);
-                hover_path = path;
+                /* cannot get file info while network disconnected */
+                if (slot.directory.is_local || slot.directory.check_network ()) {
+                    /* cannot get file info while network disconnected */
+                    window.item_hovered (file);
+                    hover_path = path;
+                } else {
+                    slot.reload ();
+                    slot.directory.need_reload ();
+                }
             }
 
             return false;
@@ -2388,13 +2569,13 @@
         }
 
         protected void on_name_editing_canceled () {
-                if (!renaming)
-                    return;
+            if (!renaming)
+                return;
 
-                renaming = false;
-                name_renderer.editable = false;
-                unfreeze_updates ();
-                grab_focus ();
+            renaming = false;
+            name_renderer.editable = false;
+            unfreeze_updates ();
+            grab_focus ();
         }
 
         protected void on_name_edited (string path_string, string new_name) {
@@ -2416,9 +2597,11 @@
                                                        new_name);
                     dialog.run ();
                     dialog.destroy ();
-                    on_name_editing_canceled ();
+                    new_name = "";
                 }
+            }
 
+            if (new_name != "") {
                 var path = new Gtk.TreePath.from_string (path_string);
                 Gtk.TreeIter? iter = null;
                 model.get_iter (out iter, path);
@@ -2437,6 +2620,9 @@
             }
 
             on_name_editing_canceled ();
+
+            if (!slot.directory.is_local && new_name != original_name)
+                slot.directory.need_reload ();
         }
 
         public virtual bool on_view_draw (Cairo.Context cr) {
@@ -2738,8 +2924,6 @@
                     warning ("Could not set file attributes - %s", e.message);
                 }
             });
-
-            update_menu_actions_sort ();
         }
 
         protected void cancel_timeout (ref uint id) {
@@ -2810,9 +2994,6 @@
         protected abstract void freeze_tree ();
         protected abstract void thaw_tree ();
 
-
-        
-
 /** Unimplemented methods
  *  fm_directory_view_parent_set ()  - purpose unclear
 */ 

=== modified file 'src/View/ColumnView.vala'
--- src/View/ColumnView.vala	2014-12-26 14:20:20 +0000
+++ src/View/ColumnView.vala	2015-02-07 19:01:29 +0000
@@ -137,7 +137,7 @@
                 cancel_await_double_click ();
 
                 if (selected_folder != null)
-                    load_root_location (selected_folder.location);
+                    load_root_location (selected_folder.get_target_location ());
 
                 result = true;
             }

=== modified file 'src/View/DiskRenderer.vala'
--- src/View/DiskRenderer.vala	2014-12-19 17:34:11 +0000
+++ src/View/DiskRenderer.vala	2015-02-07 19:01:29 +0000
@@ -23,10 +23,14 @@
     public uint64 free_space { set; get; }
     public uint64 disk_size { set; get; }
 
+    /* padding to the right of the disk usage graphic */
+    public uint rpad {set; get;}
+
     /* offset to left align disk usage graphic with the text */
     private int offset = 2;
 
     public CellRendererDisk () {
+        rpad = 0;
     }
 
     /**
@@ -54,6 +58,7 @@
             Gtk.StateFlags state;
             Gtk.StyleContext context = widget.get_parent ().get_style_context ();
             cr.set_line_width (1.0);
+            uint width = area.width - rpad;
             if (widget.get_state_flags () != Gtk.StateFlags.BACKDROP) {
                 state = Gtk.StateFlags.NORMAL;
                 state |= widget.get_state_flags ();
@@ -62,7 +67,7 @@
                 Gdk.cairo_set_source_rgba (cr, color_border);
                 cr.rectangle (area.x,
                               area.y + area.height - 3,
-                              area.width,
+                              width,
                               4);
                 cr.fill ();
             }
@@ -71,14 +76,14 @@
             Gdk.cairo_set_source_rgba (cr, context.get_color (state));
             cr.rectangle (area.x + 1,
                           area.y + area.height - 2,
-                          area.width - 2,
+                          width - 2,
                           2);
             cr.fill ();
 
             Gdk.cairo_set_source_rgba (cr, context.get_background_color(state));
             cr.rectangle (area.x + 1,
                           area.y + area.height - 2,
-                          area.width - (int)(((double)free_space)/((double)disk_size)*((double)area.width - 2)),
+                          width - (int)(((double)free_space)/((double)disk_size)*((double)area.width - 2)),
                           2);
             cr.stroke ();
         }

=== modified file 'src/View/LocationBar.vala'
--- src/View/LocationBar.vala	2015-01-24 13:51:05 +0000
+++ src/View/LocationBar.vala	2015-02-07 19:01:29 +0000
@@ -92,8 +92,8 @@
             bread.search_mode = true;
         }
 
-        private void on_path_changed (File file) {
-            if (win.freeze_view_changes)
+        private void on_path_changed (File? file) {
+            if (file == null || win.freeze_view_changes)
                 return;
 
             win.grab_focus ();
@@ -136,14 +136,15 @@
         {
             this.win = win;
             /* FIXME the string split of the path url is kinda too basic, we should use the Gile to split our uris and determine the protocol (if any) with g_uri_parse_scheme or g_file_get_uri_scheme */
-            add_icon ({ "afp://", Marlin.ICON_FOLDER_REMOTE_SYMBOLIC, true, null, null, null, true, _("AFP")});
-            add_icon ({ "dav://", Marlin.ICON_FOLDER_REMOTE_SYMBOLIC, true, null, null, null, true, _("DAV")});
-            add_icon ({ "davs://", Marlin.ICON_FOLDER_REMOTE_SYMBOLIC, true, null, null, null, true, _("DAVS")});
-            add_icon ({ "ftp://", Marlin.ICON_FOLDER_REMOTE_SYMBOLIC, true, null, null, null, true, _("FTP")});
-            add_icon ({ "network://", Marlin.ICON_FOLDER_REMOTE_SYMBOLIC, true, null, null, null, true, _("Network")});
-            add_icon ({ "sftp://", Marlin.ICON_FOLDER_REMOTE_SYMBOLIC, true, null, null, null, true, _("SFTP")});
-            add_icon ({ "smb://", Marlin.ICON_FOLDER_REMOTE_SYMBOLIC, true, null, null, null, true, _("SMB")});
-            add_icon ({ "trash://", Marlin.ICON_TRASH_SYMBOLIC, true, null, null, null, true, _("Trash")});
+            add_icon ({ "afp://", Marlin.ICON_FOLDER_REMOTE_SYMBOLIC, true, null, null, null, true, Marlin.PROTOCOL_NAME_AFP});
+            add_icon ({ "dav://", Marlin.ICON_FOLDER_REMOTE_SYMBOLIC, true, null, null, null, true, Marlin.PROTOCOL_NAME_DAV});
+            add_icon ({ "davs://", Marlin.ICON_FOLDER_REMOTE_SYMBOLIC, true, null, null, null, true,Marlin.PROTOCOL_NAME_DAVS});
+            add_icon ({ "ftp://", Marlin.ICON_FOLDER_REMOTE_SYMBOLIC, true, null, null, null, true, Marlin.PROTOCOL_NAME_FTP});
+            add_icon ({ "network://", Marlin.ICON_FOLDER_REMOTE_SYMBOLIC, true, null, null, null, true, Marlin.PROTOCOL_NAME_NETWORK});
+            add_icon ({ "sftp://", Marlin.ICON_FOLDER_REMOTE_SYMBOLIC, true, null, null, null, true, Marlin.PROTOCOL_NAME_SFTP});
+            add_icon ({ "smb://", Marlin.ICON_FOLDER_REMOTE_SYMBOLIC, true, null, null, null, true,Marlin.PROTOCOL_NAME_SMB});
+            add_icon ({ "trash://", Marlin.ICON_TRASH_SYMBOLIC, true, null, null, null, true, Marlin.PROTOCOL_NAME_TRASH});
+
 
             /* music */
             string dir;
@@ -233,12 +234,12 @@
             completed.connect (() => {
                 string path = "";
                 string newpath = update_breadcrumbs (get_file_for_path (text).get_uri (), path);
-                
+
                 foreach (BreadcrumbsElement element in elements) {
                     if (!element.hidden)
                         path += element.text + "/";
                 }
-            
+
                 if (path != newpath)
                     change_breadcrumbs (newpath);
                 
@@ -320,9 +321,12 @@
         }
 
         public void on_need_completion () {
-            File file = get_file_for_path (text);
-
-            // don't use get_basename (), it will return "folder" for "/folder/"
+            File? file = get_file_for_path (text);
+
+            if (file == null)
+                return;
+
+            /* don't use get_basename (), it will return "folder" for "/folder/" */
             int last_slash = text.last_index_of_char ('/');
             if (last_slash > -1 && last_slash < text.length)
                 to_search = text.slice (last_slash + 1, text.length);
@@ -338,20 +342,19 @@
                 return;
             
             files = GOF.Directory.Async.from_gfile (file);
-            if (files.file.exists) {
+            if (files.file.exists)
                 files.load (on_file_loaded);
-            }
         }
 
         private void on_files_loaded_menu () {
-            // First the "Open in new tab" menuitem is added to the menu.
+            /* First the "Open in new tab" menuitem is added to the menu. */
             var menuitem_newtab = new Gtk.MenuItem.with_label (_("Open in New Tab"));
             menu.append (menuitem_newtab);
             menuitem_newtab.activate.connect (() => {
-                win.add_tab (File.new_for_uri (current_right_click_path), Marlin.ViewMode.CURRENT);
+                win.add_tab (File.new_for_commandline_arg (current_right_click_path), Marlin.ViewMode.CURRENT);
             });
 
-            // Then the "Open with" menuitem is added to the menu.
+            /* Then the "Open with" menuitem is added to the menu. */
             var menu_open_with = new Gtk.MenuItem.with_label (_("Open with"));
             menu.append (menu_open_with);
 
@@ -432,12 +435,15 @@
         }
 
         protected override void load_right_click_menu (double x, double y) {
+            if (current_right_click_root == null)
+                return;
+
             menu_x_root = x;
             menu_y_root = y;
             menu = new Gtk.Menu ();
             menu.cancel.connect (() => { reset_elements_states (); });
             menu.deactivate.connect (() => { reset_elements_states (); });
-            /* current_right_click_root is parent of the directory named on the breadcrumb. */ 
+            /* current_right_click_root is parent of the directory named on the breadcrumb. */
             var directory = File.new_for_uri (current_right_click_root);
             files_menu = GOF.Directory.Async.from_gfile (directory);
             files_menu.done_loading.connect (on_files_loaded_menu);

=== modified file 'src/View/OverlayBar.vala'
--- src/View/OverlayBar.vala	2015-01-16 17:08:14 +0000
+++ src/View/OverlayBar.vala	2015-02-07 19:01:29 +0000
@@ -130,11 +130,10 @@
                 } else if (!goffile.is_folder ()) {
 
                     /* if we have an image, see if we can get its resolution */
-                    var type = goffile.get_ftype ();
-                    if (type.substring (0, 6) == "image/" && !(type in SKIP_IMAGES)) {
+                    string? type = goffile.get_ftype ();
+                    if (type != null && type.substring (0, 6) == "image/" && !(type in SKIP_IMAGES)) {
                         load_resolution.begin (goffile);
                     }
-
                     status = "%s (%s)".printf (goffile.formated_type, format_size ((int64) PropertiesWindow.file_real_size (goffile)));
                 } else {
                     status = "%s - %s".printf (goffile.info.get_name (), goffile.formated_type);

=== modified file 'src/View/PropertiesWindow.vala'
--- src/View/PropertiesWindow.vala	2015-01-17 04:26:34 +0000
+++ src/View/PropertiesWindow.vala	2015-02-07 19:01:29 +0000
@@ -1362,16 +1362,22 @@
     }
 
     public static uint64 file_real_size (GOF.File gof) {
+        if (!gof.is_connected)
+            return 0;
+
         uint64 file_size = gof.size;
-        try {
-            var info = gof.location.query_info (FileAttribute.STANDARD_ALLOCATED_SIZE, FileQueryInfoFlags.NONE);
-            uint64 allocated_size = info.get_attribute_uint64 (FileAttribute.STANDARD_ALLOCATED_SIZE);
-            // Check for sparse file, allocated size will be smaller, for normal files allocated size
-            // includes overhead size so we don't use it for those here
-            if (allocated_size < file_size && !gof.is_directory)
-                file_size = allocated_size;
-        } catch (Error err) {
-            warning ("%s", err.message);
+        if (gof.location is GLib.File) {
+            try {
+                var info = gof.location.query_info (FileAttribute.STANDARD_ALLOCATED_SIZE, FileQueryInfoFlags.NONE);
+                uint64 allocated_size = info.get_attribute_uint64 (FileAttribute.STANDARD_ALLOCATED_SIZE);
+                // Check for sparse file, allocated size will be smaller, for normal files allocated size
+                // includes overhead size so we don't use it for those here
+                if (allocated_size < file_size && !gof.is_directory)
+                    file_size = allocated_size;
+            } catch (Error err) {
+                warning ("%s", err.message);
+                gof.is_connected = false;
+            }
         }
         return file_size;
     }

=== modified file 'src/View/Resources.vala'
--- src/View/Resources.vala	2014-11-13 20:24:33 +0000
+++ src/View/Resources.vala	2015-02-07 19:01:29 +0000
@@ -52,4 +52,56 @@
     public const string NETWORK_URI = "network:///";
 
     public const string OPEN_IN_TERMINAL_DESKTOP_ID = "open-pantheon-terminal-here.desktop";
+
+    public const string PROTOCOL_NAME_AFP = _("AFP");
+    public const string PROTOCOL_NAME_DAV = _("DAV");
+    public const string PROTOCOL_NAME_DAVS = _("DAVS");
+    public const string PROTOCOL_NAME_FTP = _("FTP");
+    public const string PROTOCOL_NAME_NETWORK = _("Network");
+    public const string PROTOCOL_NAME_SFTP = _("SFTP");
+    public const string PROTOCOL_NAME_SMB = _("SMB");
+    public const string PROTOCOL_NAME_TRASH = _("Trash");
+
+    public string protocol_to_name (string protocol) {
+        /* Deal with protocol with or without : or / characters at the end */
+        string s = protocol.delimit (":/", ' ').chomp ();
+
+        switch (s) {
+            case "trash":
+                return Marlin.PROTOCOL_NAME_TRASH;
+            case "network":
+                return Marlin.PROTOCOL_NAME_NETWORK;
+            case "smb": 
+                return Marlin.PROTOCOL_NAME_SMB;
+            case "ftp": 
+                return Marlin.PROTOCOL_NAME_FTP;
+            case "sftp": 
+                return Marlin.PROTOCOL_NAME_SFTP;
+            case "afp":
+                return Marlin.PROTOCOL_NAME_AFP;
+            case "dav":
+                return Marlin.PROTOCOL_NAME_DAV;
+            case "davs":
+                return Marlin.PROTOCOL_NAME_DAVS;
+            default:
+                return protocol;
+        }
+    }
+
+    public string get_smb_share_from_uri (string uri) {
+        if (!(Uri.parse_scheme (uri) == "smb"))
+            return (uri);
+
+        string [] uri_parts = uri.split (Path.DIR_SEPARATOR_S);
+
+        if (uri_parts.length < 4)
+            return uri;
+        else {
+            var sb = new StringBuilder ();
+            for (int i = 0; i < 4; i++)
+                sb.append (uri_parts [i] + Path.DIR_SEPARATOR_S);
+
+            return sb.str;
+        }
+    }
 }

=== modified file 'src/View/Sidebar.vala'
--- src/View/Sidebar.vala	2015-01-27 14:20:52 +0000
+++ src/View/Sidebar.vala	2015-02-07 19:01:29 +0000
@@ -33,9 +33,8 @@
 
         private const int MAX_BOOKMARKS_DROPPED = 100;
         private const int ROOT_INDENTATION_XPAD = 2;
-        private const int EJECT_BUTTON_XPAD = 12;
-        private const int TEXT_XPAD = 5;
-        private const int ICON_XPAD = 6;
+        private const int EJECT_BUTTON_XPAD = 6;
+        private const int ICON_XPAD = 6 + ROOT_INDENTATION_XPAD;
         private const int PROP_0 = 0;
         private const int PROP_ZOOM_LEVEL = 1;
 
@@ -55,6 +54,7 @@
         Gtk.IconTheme theme;
         GLib.Icon eject_icon;
 
+        int eject_button_size = 20;
         uint n_builtins_before;
         string last_selected_uri;
         string slot_location;
@@ -125,7 +125,7 @@
 
         /* TODO Make it an option in Settings whether or not to show
          * bookmarks pointing to non-existent (or unmounted) files. */
-        bool display_all_bookmarks = false;
+        bool display_all_bookmarks = true;
 
         /* Remember vertical adjustment value when lose focus */
         double adjustment_val = 0.0;
@@ -160,32 +160,30 @@
             tree_view.set_size_request (Preferences.settings.get_int ("minimum-sidebar-width"), -1);
             tree_view.set_headers_visible (false);
 
-            var col = new Gtk.TreeViewColumn ();
+            var cab = new Gtk.CellAreaBox ();
+            var col = new Gtk.TreeViewColumn.with_area (cab);
             col.max_width = -1;
             col.expand = true;
             col.spacing = 3;
 
             var crt = new Gtk.CellRendererText ();
-            col.pack_start(crt, false);
-            col.set_cell_data_func (crt, root_indent_cell_data_func);
-
-            crt = new Gtk.CellRendererText ();
             this.indent_renderer = crt;
-            col.pack_start(crt, false);
+            cab.pack_start(crt, false, false, false);
             col.set_cell_data_func (crt, indent_cell_data_func);
 
             var crpb = new Gtk.CellRendererPixbuf ();
             this.icon_cell_renderer = crpb;
             crpb.follow_state = true;
             crpb.stock_size = Gtk.IconSize.MENU;
-            col.pack_start(crpb, false);
+            cab.pack_start(crpb, false, false, false);
             col.set_attributes (crpb, "gicon", Column.ICON);
             col.set_cell_data_func (crpb, icon_cell_data_func);
 
             var crd = new Marlin.CellRendererDisk ();
             crd.ellipsize = Pango.EllipsizeMode.END;
             crd.ellipsize_set = true;
-            col.pack_start (crd, true);
+            crd.rpad = 12;
+            cab.pack_start (crd, true, false, false);
             col.set_attributes (crd,
                                 "text", Column.NAME,
                                 "visible", Column.EJECT,
@@ -196,9 +194,9 @@
             eject_spinner_cell_renderer = crs;
             crs.mode = Gtk.CellRendererMode.ACTIVATABLE;
             crs.icon_size = Gtk.IconSize.MENU;
-            crs.xpad = EJECT_BUTTON_XPAD;
+            crs.xpad = 0;
             crs.xalign = (float)1.0;
-            col.pack_start (crs, false);
+            cab.pack_start (crs, false, false, false);
             col.set_attributes (crs,
                                 "gicon", Column.EJECT_ICON,
                                 "visible", Column.EJECT,
@@ -212,7 +210,7 @@
             name_renderer.ellipsize_set = true;
             name_renderer.edited.connect (edited);
             name_renderer.editing_canceled.connect (editing_canceled);
-            col.pack_start (name_renderer,true);
+            cab.pack_start (name_renderer,true, false, false);
             col.set_attributes (name_renderer,
                                 "text", Column.NAME,
                                 "visible", Column.NO_EJECT,
@@ -225,11 +223,16 @@
             cre.is_category_expander = true;
             /* this is required to align the eject buttons to the right */
             int exp_size = cre.get_arrow_size (tree_view);
-            cre.xpad = (16 - exp_size).abs () + EJECT_BUTTON_XPAD - 2;
-            cre.xalign = (float)1.0;
-            col.pack_end (cre, false);
+            Gtk.icon_size_lookup (Gtk.IconSize.MENU, out eject_button_size, null);
+            cre.xpad = int.max ((eject_button_size - exp_size)/2, 0);
+            cab.pack_start (cre, false, false, false);
             col.set_cell_data_func (cre, expander_cell_data_func);
 
+            crt = new Gtk.CellRendererText ();
+            crt.xpad = EJECT_BUTTON_XPAD;
+            crt.xalign = (float)1.0;
+            cab.pack_start(crt, false, false, false);
+
             tree_view.append_column (col);
             tree_view.tooltip_column = Column.TOOLTIP;
             tree_view.model = this.store;
@@ -249,7 +252,9 @@
             tree_view.enable_model_drag_source (Gdk.ModifierType.BUTTON1_MASK,
                                                 source_targets,
                                                 Gdk.DragAction.MOVE);
-            Gtk.drag_dest_set (tree_view, Gtk.DestDefaults.MOTION, drop_targets,
+            Gtk.drag_dest_set (tree_view,
+                               Gtk.DestDefaults.MOTION,
+                               drop_targets,
                                Gdk.DragAction.MOVE | Gdk.DragAction.COPY | Gdk.DragAction.LINK);
         }
 
@@ -564,13 +569,17 @@
                 if (volume != null)
                     continue;
 
+
                 var root = mount.get_default_location ();
                 if (root.is_native ()) {
                     string scheme = root.get_uri_scheme ();
-                    if (scheme == "archive") {
+                    if (scheme == "archive" ) {
                         network_mounts.prepend (mount);
                         continue;
                     }
+                } else {
+                    network_mounts.prepend (mount);
+                    continue;
                 }
 
                 add_place (Marlin.PlaceType.MOUNTED_VOLUME,
@@ -602,16 +611,23 @@
             network_mounts.reverse ();
             foreach (Mount mount in network_mounts) {
                 var root = mount.get_default_location ();
+                /* 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
+                 * when creating the mount.
+                 */
+                string uri = Marlin.get_smb_share_from_uri (root.get_uri ());
+
                 add_place (Marlin.PlaceType.BUILT_IN,
                            iter,
                            mount.get_name (),
                            mount.get_icon (),
-                           root.get_uri (),
+                           uri,
                            null,
                            null,
                            mount,
                            0,
-                           root.get_parse_name ());
+                           uri);
             }
 
             /* Add Entire Network BUILTIN */
@@ -913,7 +929,7 @@
                                                      null,
                                                      File.new_for_uri (drop_uri),
                                                      real_action,
-                                                     null, null, null);
+                                                     this, null, null);
                     return true;
                 case TargetType.GTK_TREE_MODEL_ROW:
                     return false;
@@ -964,12 +980,13 @@
                 if (can_accept_file_as_bookmark (file))
                     uris.prepend (file.get_uri ());
             });
+
             if (uris != null)
                 bookmarks.insert_uris (uris, position);
         }
 
-        public void add_uri (string uri) {
-            bookmarks.insert_uri_at_end (uri);
+        public void add_uri (string uri, string? label = null) {
+            bookmarks.insert_uri_at_end (uri, label);
         }
 
         private  bool drag_scroll_timer () {
@@ -1388,22 +1405,13 @@
             cell.set_visible (!store.iter_has_child (iter));
         }
 
-        private void root_indent_cell_data_func (Gtk.CellLayout layout,
-                                                 Gtk.CellRenderer cell,
-                                                 Gtk.TreeModel model,
-                                                 Gtk.TreeIter iter) {
-            cell.set_visible (true);
-            cell.xpad = ROOT_INDENTATION_XPAD;
-        }
-
         private void indent_cell_data_func (Gtk.CellLayout layout,
                                                  Gtk.CellRenderer cell,
                                                  Gtk.TreeModel model,
                                                  Gtk.TreeIter iter) {
             var path = store.get_path (iter);
             var depth = path.get_depth ();
-            cell.set_visible (depth > 1);
-            cell.xpad = ICON_XPAD;
+            cell.xpad = depth > 1 ? ICON_XPAD : ROOT_INDENTATION_XPAD;
         }
 
         private void expander_cell_data_func (Gtk.CellLayout layout,
@@ -1460,8 +1468,9 @@
                                              Gtk.CellRenderer renderer,
                                              Gtk.TreeModel model,
                                              Gtk.TreeIter iter) {
+
+            var crt = renderer as Gtk.CellRendererText;
             Marlin.PlaceType type;
-            Gtk.CellRendererText crt = renderer as Gtk.CellRendererText;
             model.@get (iter, Column.ROW_TYPE, out type, -1);
 
             if (type == Marlin.PlaceType.PERSONAL_CATEGORY ||
@@ -1682,7 +1691,7 @@
                     mount.unmount_with_operation.end (res);
                 }
                 catch (GLib.Error error) {
-                    warning ("Error while unmounting");
+                    debug ("Error while unmounting");
                 }
                 finish_eject_or_unmount (row_ref);
             });
@@ -1690,17 +1699,16 @@
 
         private void empty_trash_on_mount (Mount? mount, Gtk.TreeRowReference? row_ref = null) {
             if (Marlin.FileOperations.has_trash_files (mount)) {
-                    unowned GLib.List<unowned GLib.File>? dirs = Marlin.FileOperations.get_trash_dirs_for_mount (mount);
-                    /* Marlin.FileOperations will show a confirm dialog according to settings */
-                    if (dirs != null)
-                        Marlin.FileOperations.empty_trash_dirs (null, dirs.copy ());
+                unowned GLib.List<unowned GLib.File>? dirs = Marlin.FileOperations.get_trash_dirs_for_mount (mount);
+                /* Marlin.FileOperations will show a confirm dialog according to settings */
+                if (dirs != null)
+                    Marlin.FileOperations.empty_trash_dirs (null, dirs.copy ());
             }
         }
 
         private bool over_eject_button (int x, int y, out Gtk.TreePath p) {
             unowned Gtk.TreeViewColumn column;
             int width, x_offset, hseparator;
-            int eject_button_size;
             bool show_eject;
             Gtk.TreeIter iter;
             Gtk.TreePath path;
@@ -1723,8 +1731,7 @@
                 column.cell_set_cell_data (store, iter, false, false);
                 column.cell_get_position (eject_spinner_cell_renderer, out x_offset, out width);
 
-                eject_button_size = 20;
-                x_offset += width - hseparator - EJECT_BUTTON_XPAD - eject_button_size;
+                x_offset += width - hseparator - eject_button_size;
                 if (cell_x - x_offset >= 0 && cell_x - x_offset <= eject_button_size)
                     return true;
             }

=== modified file 'src/View/Slot.vala'
--- src/View/Slot.vala	2015-01-25 20:40:53 +0000
+++ src/View/Slot.vala	2015-02-07 19:01:29 +0000
@@ -60,6 +60,7 @@
             set_up_directory (_location);
             connect_slot_signals ();
             make_view ();
+            connect_dir_view_signals ();
         }
 
         ~Slot () {
@@ -107,12 +108,16 @@
 
                 if (mode == Marlin.ViewMode.MILLER_COLUMNS)
                     autosize_slot ();
+
+                set_view_updates_frozen (false);
             });
 
             if (mode == Marlin.ViewMode.MILLER_COLUMNS)
                 directory.track_longest_name = true;
 
-            directory.need_reload.connect (ctab.reload);
+            directory.need_reload.connect (() => {
+                ctab.reload ();
+            });
         }
 
         private void schedule_path_change_request (GLib.File loc, int flag, bool make_root) {
@@ -123,7 +128,7 @@
         }
 
         private void on_path_change_request (GLib.File loc, int flag, bool make_root) {
-            if (flag == 0) {
+            if (flag == 0) { /* make view in existing container */
                 if (dir_view is FM.ColumnView)
                     miller_slot_request (loc, make_root);
                 else
@@ -166,18 +171,13 @@
 
         public override void user_path_change_request (GLib.File loc, bool allow_mode_change = true) {
             assert (loc != null);
-
-            if (!location.equal (loc)) {
-                var old_dir = directory;
-                set_up_directory (loc);
-                dir_view.change_directory (old_dir, directory);
-                /* ViewContainer takes care of updating appearance
-                 * If allow_mode_change is false View Container will not automagically
-                 * switch to icon view for icon folders (needed for Miller View) */
-                ctab.slot_path_changed (loc, allow_mode_change);
-            } else {
-                ctab.reload ();
-            }
+            var old_dir = directory;
+            set_up_directory (loc);
+            dir_view.change_directory (old_dir, directory);
+            /* ViewContainer takes care of updating appearance
+             * If allow_mode_change is false View Container will not automagically
+             * switch to icon view for icon folders (needed for Miller View) */
+            ctab.slot_path_changed (directory.location, allow_mode_change);
         }
 
         protected override void make_view () {
@@ -203,7 +203,7 @@
             if (mode != Marlin.ViewMode.MILLER_COLUMNS)
                 content_box.pack_start (dir_view, true, true, 0);
 
-            connect_dir_view_signals ();
+            set_view_updates_frozen (true);
         }
 
         public void set_view_updates_frozen (bool freeze) {
@@ -275,8 +275,7 @@
         }
 
         public override void reload () {
-            if (dir_view != null)
-                dir_view.reload ();
+            user_path_change_request (location, false);
         }
 
         public override void cancel () {

=== modified file 'src/View/ViewContainer.vala'
--- src/View/ViewContainer.vala	2015-01-11 10:25:14 +0000
+++ src/View/ViewContainer.vala	2015-02-07 19:01:29 +0000
@@ -45,10 +45,19 @@
                 return slot != null ? slot.uri : null;
             }
         }
+
+        public GOF.AbstractSlot? slot {
+            get {
+                return get_current_slot ();
+            }
+        }
+
         public OverlayBar overlay_statusbar;
         private Browser browser;
         private GLib.List<GLib.File>? selected_locations = null;
 
+        private bool ready = false;
+
         public signal void tab_name_changed (string tab_name);
         public signal void loading (bool is_loading);
         /* To maintain compatibility with existing plugins */
@@ -137,7 +146,6 @@
 
         public void change_view_mode (Marlin.ViewMode mode, GLib.File? loc = null) {
             if (mode != view_mode) {
-
                 if (loc == null) /* Only untrue on container creation */
                     loc = this.location;
 
@@ -158,15 +166,19 @@
                 else
                     view = new Slot (loc, this, mode);
 
+                content = view.get_content_box ();
+
                 view_mode = mode;
-                set_up_current_slot ();
                 overlay_statusbar.showbar = view_mode != Marlin.ViewMode.LIST;
                 overlay_statusbar.reset_selection ();
+
+                load_slot_directory (view);
                 window.update_top_menu ();
             }
         }
 
         public void user_path_change_request (GLib.File loc) {
+            loading (true);
             view.user_path_change_request (loc);
         }
 
@@ -197,28 +209,39 @@
         }
 
         private void set_up_current_slot () {
-            var slot = get_current_slot ();
-            assert (slot != null);
-            assert (slot.directory != null);
-
-            content = view.get_content_box ();
-            load_slot_directory (slot);
+            ready = false;
+            load_slot_directory (get_current_slot ());
         }
 
-        public void load_slot_directory (GOF.AbstractSlot slot) {
-            can_show_folder = true;
-            loading (true);
-            /* Allow time for the window to update before starting to load directory so that
-             * the window is displayed more quickly
-             * when starting the application in, or switching view to, a folder that contains
-             * a large number of files. Also ensures infobars are added correctly by plugins.
-             */           
-            Timeout.add (100, () => {
-                slot.directory.load ();
-                plugin_directory_loaded ();
-                return false;
-            });
+        public void load_slot_directory (GOF.AbstractSlot? slot) {
+            if (slot == null)
+                return;
+
             refresh_slot_info (slot);
+
+            /* Allow time for the window to update before trying to load directory so that
+             * the window is displayed more quickly when starting the application in,
+             * or switching view to, a folder that contains a large number of files.
+             * Also ensures infobars are added correctly by plugins.  Only checking in idle
+             * time allows pathbar animation to complete smoothly.
+
+             * Wait until directory is flagged ready to allow time for network folders to be found
+             * and accessed.
+
+             * Do not try and load directory that is not flagged 'can load'.
+             */
+            Idle.add (() => {
+                if (!slot.directory.is_ready)
+                    return true;
+
+                if (slot.directory.can_load) {
+                    slot.directory.load ();
+                    plugin_directory_loaded ();
+                } else
+                     directory_done_loading (slot);
+
+                return false;
+            });
         }
 
         private void plugin_directory_loaded () {
@@ -235,7 +258,6 @@
         public void refresh_slot_info (GOF.AbstractSlot aslot) {
             GLib.File loc = aslot.directory.file.location;
             update_tab_name (loc);
-
             browser.record_uri (loc.get_parse_name ()); /* will ignore null changes */
 
             window.loading_uri (loc.get_uri ());
@@ -246,56 +268,78 @@
         }
 
         public void update_tab_name (GLib.File loc) {
-            var slot_path = loc.get_path ();
-
-            if (slot_path == Environment.get_home_dir ())
+            string? slot_path = loc.get_path ();
+            tab_name = "-----";
+            if (slot_path == null) {
+                string [] uri_parts = loc.get_uri ().split (Path.DIR_SEPARATOR_S);
+                uint index = uri_parts.length - 1;
+                string s;
+                while (index >= 0) {
+                    s = uri_parts [index];
+                    if (s.length >= 1) {
+                        if (index == 0) {
+                            tab_name = Marlin.protocol_to_name (s);
+                        } else
+                            tab_name = s;
+                        break;
+                    }
+                    index--;
+                }
+            } else if (slot_path == Environment.get_home_dir ())
                 tab_name = _("Home");
             else if (slot_path == "/")
                 tab_name = _("File System");
-            else if (loc.query_exists ()) {
+            else {
                 try {
                     var info = loc.query_info (FileAttribute.STANDARD_DISPLAY_NAME, FileQueryInfoFlags.NONE);
                     tab_name = info.get_attribute_string (FileAttribute.STANDARD_DISPLAY_NAME);
                 }
                 catch (GLib.Error e) {
                     warning ("Could not get location display name. %s", e.message);
+                    tab_name = loc.get_basename ();
+                    can_show_folder = false;
                 }
-
-            } else {
-                tab_name = _("This folder does not exist");
-                can_show_folder = false;
             }
 
+            if (tab_name == "-----")
+                tab_name = loc.get_uri ();
+
             if (Posix.getuid() == 0)
                 tab_name = tab_name + " " + _("(as Administrator)");
-
         }
 
         public void directory_done_loading (GOF.AbstractSlot slot) {
-            FileInfo file_info;
-
             loading (false);
-
-            try {
-                file_info = slot.location.query_info ("standard::*,access::*", FileQueryInfoFlags.NONE);
-
-                /* If not readable, alert the user */
-                if (slot.directory.permission_denied) {
-                    content = new Granite.Widgets.Welcome (_("This does not belong to you."),
+            can_show_folder = true;
+
+            if (slot.directory.permission_denied) {
+                content = new Granite.Widgets.Welcome (_("This does not belong to you."),
                                                            _("You don't have permission to view this folder."));
+                can_show_folder = false;
+            } else if (!slot.directory.can_load) {
+                content = new Granite.Widgets.Welcome (_("Unable to mount folder."),
+                                                           _("The server for this folder could not be located."));
+                can_show_folder = false;
+            } else if (!slot.directory.file.exists) {
+                    content = new DirectoryNotFound (slot.directory, this);
                     can_show_folder = false;
-                } else if (file_info.get_file_type () == FileType.DIRECTORY && selected_locations != null) {
+            } else if (selected_locations != null) {
                     view.select_glib_files (selected_locations, null);
                     selected_locations = null;
-                }
-            } catch (Error err) {
-                /* query_info will throw an exception if it cannot find the file */
-                if (err is IOError.NOT_MOUNTED)
-                    slot.reload ();
+            } else if (slot.directory.selected_file != null) {
+                if (slot.directory.selected_file.query_exists ())
+                    focus_location_if_in_current_directory (slot.directory.selected_file);
                 else {
-                    content = new DirectoryNotFound (slot.directory, this);
+                    content = new Granite.Widgets.Welcome (_("File not found."),
+                                                           _("The file selected no longer exists."));
                     can_show_folder = false;
                 }
+                slot.directory.selected_file = null;
+            }
+
+            if (can_show_folder) {
+                ready = true;
+                content = view.get_content_box ();
             }
         }
 
@@ -353,11 +397,8 @@
                 }
             }
 
-            if (loc != null) {
+            if (loc != null)
                 user_path_change_request (loc);
-                slot_path_changed (loc);
-                refresh_slot_info (get_current_slot ());
-            }
         }
 
         public void focus_location_if_in_current_directory (GLib.File? file,
@@ -382,16 +423,19 @@
             return path;
         }
 
-        public void reload () {
-            if (!can_show_folder) /* Try to display folder again */
-                content = view.get_content_box ();
-
-            loading (true);
+        public void reload (bool propagate = true) {
             /* Allow time for the signal to propagate and the tab label to redraw */
-            Timeout.add (10, () => {
+            Idle.add (() => {
                 var slot = view.get_current_slot ();
                 slot.reload ();
                 load_slot_directory (slot);
+                /* For remote folders, make sure any other windows showing the same folder are
+                 * also refreshed. Prevent infinite loop with propagate - when called from application,
+                 * propagate will be false.
+                 */   
+                if (propagate)
+                    ((Marlin.Application)(window.application)).tab_reloaded (window, slot.location);
+
                 return false;
             });
         }

=== modified file 'src/View/Window.vala'
--- src/View/Window.vala	2015-01-26 10:59:26 +0000
+++ src/View/Window.vala	2015-02-07 19:01:29 +0000
@@ -58,6 +58,7 @@
         public Granite.Widgets.DynamicNotebook tabs;
         public Marlin.Places.Sidebar sidebar;
         public ViewContainer? current_tab = null;
+        public uint window_number;
 
         public void set_can_go_forward (bool can) {
            top_menu.set_can_go_forward (can);
@@ -73,6 +74,7 @@
         public signal void selection_changed (GLib.List<GOF.File> gof_file);
         public signal void loading_uri (string location);
         public signal void folder_deleted (GLib.File location);
+        public signal void tab_reloaded (GLib.File location);
 
         [Signal (action=true)]
         public virtual signal void go_up () {
@@ -86,7 +88,7 @@
 
         public Window (Marlin.Application app, Gdk.Screen myscreen) {
             /* Capture application window_count and active_window before they can change */
-            var window_number = app.window_count;
+            window_number = app.window_count;
             application = app;
             screen = myscreen;
             is_first_window = (window_number == 0);
@@ -332,6 +334,9 @@
         }
 
         public void change_tab (int offset) {
+            if (freeze_view_changes)
+                return;
+
             ViewContainer? old_tab = current_tab;
             current_tab = (tabs.get_tab_by_index (offset)).page as ViewContainer;
 
@@ -582,12 +587,18 @@
 
         private void action_undo (GLib.SimpleAction action, GLib.Variant? param) {
             update_undo_actions ();
-            undo_manager.undo (null);
+            undo_manager.undo (this, after_undo_redo);
+        }
+
+        public static void after_undo_redo (void  *data) {
+            var window = data as Marlin.View.Window;
+            if (!window.current_tab.slot.directory.is_local)
+                window.current_tab.reload ();
         }
 
         private void action_redo (GLib.SimpleAction action, GLib.Variant? param) {
             update_undo_actions ();
-            undo_manager.redo (null);
+            undo_manager.redo (this, after_undo_redo);
         }
 
         private void change_state_select_all (GLib.SimpleAction action) {
@@ -600,6 +611,7 @@
             }
         }
 
+
         public void change_state_show_hidden (GLib.SimpleAction action) {
             bool state = !action.state.get_boolean ();
             action.set_state (new GLib.Variant.boolean (state));
@@ -835,6 +847,14 @@
         private bool valid_location (GLib.File location) {
             GLib.FileInfo? info = null;
 
+            string scheme = location.get_uri_scheme ();
+            if (scheme == "smb" ||
+                scheme == "ftp" ||
+                scheme == "network")
+                /* Do not restore remote and network locations */
+                //return false;
+                return true;
+
             try {
                 info = location.query_info ("standard::*", GLib.FileQueryInfoFlags.NONE);
             }
@@ -886,6 +906,10 @@
         }
 
         public void update_top_menu () {
+            if (freeze_view_changes)
+                return;
+
+
             if (current_tab != null) {
                 top_menu.set_back_menu (current_tab.get_go_back_path_list ());
                 top_menu.set_forward_menu (current_tab.get_go_forward_path_list ());
@@ -916,13 +940,9 @@
         }
 
         public void file_path_change_request (GLib.File loc) {
-            FileType type = loc.query_file_type (GLib.FileQueryInfoFlags.NONE);
-
-            if (type == FileType.DIRECTORY || type == FileType.UNKNOWN)
-                /* ViewContainer deals with non-existent or unmounted directories */
-                current_tab.user_path_change_request (loc);
-            else
-                current_tab.focus_location (loc);
+            /* ViewContainer deals with non-existent or unmounted directories
+             * and locations that are not directories */
+            current_tab.user_path_change_request (loc);
         }
 
         public void uri_path_change_request (string uri) {

=== modified file 'src/View/directory_view_popup.ui'
--- src/View/directory_view_popup.ui	2014-12-21 10:42:13 +0000
+++ src/View/directory_view_popup.ui	2015-02-07 19:01:29 +0000
@@ -25,6 +25,13 @@
         </item>
     </menu>
 
+    <menu id='delete'>
+        <item>
+            <attribute name='label' translatable='yes'>Delete permanently</attribute>
+            <attribute name='action'>selection.delete</attribute>
+        </item>
+    </menu>
+
     <menu id='new'>
         <submenu id='new-submenu'>
             <attribute name='label' translatable='yes'>New</attribute>
@@ -59,6 +66,9 @@
             <attribute name='action'>common.open_in</attribute>
             <attribute name="target">WINDOW</attribute>
         </item>
+    </menu>
+
+    <menu id='open-in-terminal'>
         <item>
             <attribute name='label' translatable='yes'>Terminal</attribute>
             <attribute name='action'>common.open_in</attribute>

=== modified file 'src/ZeitgeistManager.vala'
--- src/ZeitgeistManager.vala	2014-07-22 02:54:40 +0000
+++ src/ZeitgeistManager.vala	2015-02-07 19:01:29 +0000
@@ -12,7 +12,7 @@
                 try {
                     info = file.query_info_async.end (res);
                 } catch (Error e) {
-                    warning ("Fetching file info folder loggin to zeitgeist failed: %s", e.message);
+                    debug ("Fetching file info folder loggin to zeitgeist failed: %s", e.message);
                     return;
                 }
                 var log = Zeitgeist.Log.get_default ();

=== modified file 'src/gtk+-3.0.vapi'
--- src/gtk+-3.0.vapi	2014-10-02 20:52:33 +0000
+++ src/gtk+-3.0.vapi	2015-02-07 19:01:29 +0000
@@ -999,13 +999,28 @@
 		public virtual signal void remove_editable (Gtk.CellRenderer p0, Gtk.CellEditable p1);
 	}
 	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_cell_area_box_get_type ()")]
-	public class CellAreaBox : Gtk.CellArea, Gtk.CellLayout, Gtk.Buildable, Gtk.Orientable {
+    /* We have to remove the reference to the Gtk.CellLayout interface in order to use the new pack_
+     * start and pack_end functions of Gtk.CellAreaBox, which have a different signature.
+     * Instead we add the other CellLayout methods explicitly */
+	//public class CellAreaBox : Gtk.CellArea, Gtk.CellLayout, Gtk.Buildable, Gtk.Orientable {
+	public class CellAreaBox : Gtk.CellArea, Gtk.Buildable, Gtk.Orientable {
 		[CCode (has_construct_function = false, type = "GtkCellArea*")]
 		public CellAreaBox ();
 		public int get_spacing ();
 		public void set_spacing (int spacing);
 		public int spacing { get; set; }
+        public void pack_start (Gtk.CellRenderer renderer, bool expand, bool align, bool fixed);
+        public void pack_end (Gtk.CellRenderer renderer, bool expand, bool align, bool fixed);
+		public void add_attribute (Gtk.CellRenderer cell, string attribute, int column);
+		public void clear ();
+		public void clear_attributes (Gtk.CellRenderer cell);
+		public unowned Gtk.CellArea get_area ();
+		public GLib.List<weak Gtk.CellRenderer> get_cells ();
+		public void reorder (Gtk.CellRenderer cell, int position);
+		public void set_attributes (Gtk.CellRenderer cell, ...);
+		public void set_cell_data_func (Gtk.CellRenderer cell, owned Gtk.CellLayoutDataFunc func);
 	}
+
 	[CCode (cheader_filename = "gtk/gtk.h", type_id = "gtk_cell_area_context_get_type ()")]
 	public class CellAreaContext : GLib.Object {
 		[CCode (has_construct_function = false)]

=== modified file 'src/marlin-clipboard-manager.c'
--- src/marlin-clipboard-manager.c	2014-12-26 12:01:20 +0000
+++ src/marlin-clipboard-manager.c	2015-02-07 19:01:29 +0000
@@ -279,8 +279,6 @@
 
     result = NULL;
     for (i=0; lines[i] != NULL; i++) {
-        //printf ("lines %d: %s\n", i, lines[i]);
-        //result = g_list_prepend (result, g_strdup (lines[i]));
         result = g_list_prepend (result, g_file_new_for_uri (lines[i]));
     }
     return g_list_reverse (result);
@@ -291,11 +289,8 @@
                                             GtkSelectionData *selection_data,
                                             gpointer          user_data)
 {
-    //amtest
-    printf("%s\n", G_STRFUNC);
     MarlinClipboardPasteRequest *request = user_data;
     MarlinClipboardManager      *manager = MARLIN_CLIPBOARD_MANAGER (request->manager);
-    //MarlinApplication           *application;
     gboolean                     path_copy = TRUE;
     GList                       *file_list = NULL;
     char                        **lines;
@@ -329,24 +324,25 @@
     /* perform the action if possible */
     if (G_LIKELY (file_list != NULL))
     {
-        //application = marlin_application_get ();
-        //TODO
         if (G_LIKELY (path_copy))
         {
-            //marlin_application_copy_into (application, request->widget, file_list, request->target_file, request->new_files_closure);
-            printf ("marlin_application_copy_into\n");
-            /*marlin_file_operations_copy (file_list, NULL, request->target_file,
-              NULL, NULL, NULL);*/
-            marlin_file_operations_copy_move (file_list, NULL, request->target_file,
-                                              GDK_ACTION_COPY, NULL, request->new_files_closure, request->widget);
-
+            marlin_file_operations_copy_move (file_list,
+                                              NULL,
+                                              request->target_file,
+                                              GDK_ACTION_COPY,
+                                              request->widget,
+                                              request->new_files_closure,
+                                              request->widget);
         } else {
-            printf ("marlin_application_move_into\n");
-            //marlin_application_move_into (application, request->widget, file_list, request->target_file, request->new_files_closure);
-            marlin_file_operations_copy_move (file_list, NULL, request->target_file,
-                                              GDK_ACTION_MOVE, NULL, request->new_files_closure, request->widget);
+            marlin_file_operations_copy_move (file_list,
+                                              NULL,
+                                              request->target_file,
+                                              GDK_ACTION_MOVE,
+                                              request->widget,
+                                              request->new_files_closure,
+                                              request->widget);
         }
-        //g_object_unref (G_OBJECT (application));
+
         g_list_free_full (file_list, g_object_unref);
 
         /* clear the clipboard if it contained "cutted data"
@@ -729,10 +725,9 @@
 marlin_clipboard_manager_paste_files (MarlinClipboardManager *manager,
                                       GFile                  *target_file,
                                       GtkWidget              *widget,
-                                      MarlinCopyCallback     *new_files_closure)
+                                      GCallback     *new_files_closure)
 {
     MarlinClipboardPasteRequest *request;
-
     g_return_if_fail (MARLIN_IS_CLIPBOARD_MANAGER (manager));
     g_return_if_fail (widget == NULL || GTK_IS_WIDGET (widget));
 

=== modified file 'src/marlin-clipboard-manager.h'
--- src/marlin-clipboard-manager.h	2014-12-26 12:01:20 +0000
+++ src/marlin-clipboard-manager.h	2015-02-07 19:01:29 +0000
@@ -59,7 +59,7 @@
 void                    marlin_clipboard_manager_paste_files     (MarlinClipboardManager *manager,
                                                                   GFile                  *target_file,
                                                                   GtkWidget              *widget,
-                                                                  MarlinCopyCallback     *new_files_closure);
+                                                                  GCallback              *new_files_closure);
 
 
 #endif /* !__MARLIN_CLIPBOARD_MANAGER_H__ */

=== modified file 'src/marlin.vapi'
--- src/marlin.vapi	2015-01-18 20:46:03 +0000
+++ src/marlin.vapi	2015-02-07 19:01:29 +0000
@@ -41,7 +41,7 @@
             public bool has_file (GOF.File file);
             public void copy_files (GLib.List files);
             public void cut_files (GLib.List files);
-            public void paste_files (GLib.File target, Gtk.Widget widget, CopyCallBack? new_file_closure);
+            public void paste_files (GLib.File target, Gtk.Widget widget, GLib.Callback? new_file_closure);
             public signal void changed ();
         }