Merge lp://staging/~jeremywootten/pantheon-files/fix-1577399-cannot-search-trash into lp://staging/~elementary-apps/pantheon-files/trunk
Proposed by
Jeremy Wootten
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Danielle Foré | ||||
| Approved revision: | 2140 | ||||
| Merged at revision: | 2148 | ||||
| Proposed branch: | lp://staging/~jeremywootten/pantheon-files/fix-1577399-cannot-search-trash | ||||
| Merge into: | lp://staging/~elementary-apps/pantheon-files/trunk | ||||
| Diff against target: |
190 lines (+35/-17) 5 files modified
libcore/FileUtils.vala (+13/-6) libcore/marlin-icons.h (+2/-2) libwidgets/View/LocationBar.vala (+5/-1) libwidgets/View/SearchResults.vala (+14/-7) src/View/Sidebar.vala (+1/-1) |
||||
| To merge this branch: | bzr merge lp://staging/~jeremywootten/pantheon-files/fix-1577399-cannot-search-trash | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| elementary Apps team | Pending | ||
|
Review via email:
|
|||
Commit message
Enable search in trash://, recent:// and network:// views
Description of the change
This branch enables search to work in trash:// recent:// and network:// by matching on FileAttribute.
It also fixes manual navigation to these locations by correcting the constant URL strings for the root locations, making them consistent with other similar constant URL strings. Another side-effect of this is to fix the bug where these views cannot be restored.
To post a comment you must log in.
Revision history for this message
| Zisu Andrei (matzipan) wrote | # |
Revision history for this message
| Jeremy Wootten (jeremywootten) wrote | # |
Revision history for this message
| Danielle Foré (danrabbit) wrote | # |
Revision history for this message
| Jeremy Wootten (jeremywootten) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Nice one! I was going to file this bug myself :P