Merge lp://qastaging/~mhr3/unity-lens-files/fix-955229 into lp://qastaging/unity-lens-files
Proposed by
Michal Hruby
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Neil J. Patel | ||||
| Approved revision: | 220 | ||||
| Merged at revision: | 219 | ||||
| Proposed branch: | lp://qastaging/~mhr3/unity-lens-files/fix-955229 | ||||
| Merge into: | lp://qastaging/unity-lens-files | ||||
| Diff against target: |
211 lines (+160/-1) 4 files modified
src/Makefile.am (+1/-0) src/blacklist-tracker.vala (+129/-0) src/locate.vala (+16/-0) tests/manual/locate.txt (+14/-1) |
||||
| To merge this branch: | bzr merge lp://qastaging/~mhr3/unity-lens-files/fix-955229 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Neil J. Patel (community) | Approve | ||
| Siegfried Gevatter (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Monitor Zeitgeist's blacklist to make sure locate search respects privacy settings.
Description of the change
Watch Zeitgeist blacklists to make sure the non-zeitgeist searches respect privacy settings
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
There might be races with get_blacklisted
Some other comments for the sake of completeness:
* You're assuming that if there's a URI it will be in the first subject template. This is true for Activity Log Manager, but generally it could be in any position (although indeed there should be only one them; two URIs in the same event template don't make sense).
* You're ignoring single files being blacklisted. Is this because ALM only supports folders?
* And, obviously, blacklists consist of much more than URIs, but yeah, probably not much point in hiding downloads by mimetype.