Merge lp://qastaging/~angeloc/unity-lens-files/fix-for-837810 into lp://qastaging/unity-lens-files

Thanks for this! A couple of comments:

8 + string uri_desktop = "file://" + @"$(Environment.get_user_special_dir(UserDirectory.DESKTOP))";

Don't do this pls, use Gio's File.new_for_path and the get_uri () method in the File interface.

17 + var desktop_display_name = Uri.unescape_string (uri_desktop);
18 + desktop_display_name = Filename.display_basename (desktop_display_name);

Eeek, again, we have File.get_parse_name()

I also think that the desktop bookmark (which isn't a bookmark) should be last in the list, so it doesn't stick out.

Done!

modified:
    src/folder.vala
    - Using File.new_for_path instead path string concatenation
    - Moved desktop folder to the end of favourites list

Done

modified:
  src/folder.vala
  - Using get_parse_name() to get desktop folder name.

10 + File uri_desktop_file = File.new_for_path (@"$(Environment.get_user_special_dir(UserDirectory.DESKTOP))");

Can you please remove the string template, it's useless in this case.

36 + var desktop_display_name = Filename.display_basename (uri_desktop_file.get_parse_name());

This should be just Path.get_basename, not Filename.display_basename (Filename.display_basename doesn't expect utf-8 string).

25 + if (uri == uri_desktop)
26 + continue;

If the user has Desktop in favourites, we shouldn't mess with the order, and this should be just a flag "if (uri == uri_desktop) add_desktop_bookmark = false;".

Fixed the remaining issues and proposed in https://code.launchpad.net/~mhr3/unity-lens-files/fix-837810/+merge/100986 Thanks!