Merge lp:~jpakkane/unity-lens-files/nautilus-desktop-fix into lp:unity-lens-files

[Jussi Pakkanen]

Filter out dummy 'x-desktop-nautilus' entry in .gtk-bookmarks.

Filter out dummy 'x-desktop-nautilus' entry in .gtk-bookmarks.

[Paweł Stołowski (stolowski)]

What if a bookmarked folder is named 'x-nautilus-desktop'? Wouldn't it be better to filter this out when reading ~/.gtk-bookmarks to support that case?
Can you add a short comment about why we need this workaround (+ link to the bug).

review: Needs Fixing

[Jussi Pakkanen (jpakkane)]

If that were the case, the uri string would start with 'bookmark:file' and would thus not match. Still, moved the filtering to file read function for clarity. Added comment too.

[Paweł Stołowski (stolowski)]

Works fine!

review: Approve

[Unity Merger (unity-merger)]

No commit message specified.

=== modified file 'src/folder.vala'
--- src/folder.vala	2012-08-10 13:05:07 +0000
+++ src/folder.vala	2012-09-03 07:10:23 +0000
@@ -73,6 +73,9 @@
       {
         if (uri == "")
           continue;
+        // Filter out useless bookmark that is created by Nautilus.
+        // https://bugs.launchpad.net/unity-lens-files/+bug/1044309
+        if (uri.has_prefix("x-nautilus-desktop:")) continue;
           
         if (uri == desktop_uri) has_desktop_in_favourites = true;