unity-lens-files

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

  1. nautilus-desktop-fix
  2. Merge into trunk
Proposed by Jussi Pakkanen
Status: Merged
Approved by: Paweł Stołowski
Approved revision: 237
Merged at revision: 235
Proposed branch: lp://staging/~jpakkane/unity-lens-files/nautilus-desktop-fix
Merge into: lp://staging/unity-lens-files
Diff against target: 12 lines (+3/-0)
1 file modified
src/folder.vala (+3/-0)
To merge this branch: bzr merge lp://staging/~jpakkane/unity-lens-files/nautilus-desktop-fix
Reviewer Review Type Date Requested Status
Paweł Stołowski (community) Approve
Review via email: mp+122284@code.staging.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Paweł Stołowski (stolowski) wrote :

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
Revision history for this message
Jussi Pakkanen (jpakkane) wrote :

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.

Revision history for this message
Paweł Stołowski (stolowski) wrote :

Works fine!

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

No commit message specified.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches