Merge lp://qastaging/~brandontschaefer/unity-lens-music/cancellable-search into lp://qastaging/unity-lens-music

Proposed by Brandon Schaefer
Status: Merged
Approved by: Michal Hruby
Approved revision: 74
Merged at revision: 71
Proposed branch: lp://qastaging/~brandontschaefer/unity-lens-music/cancellable-search
Merge into: lp://qastaging/unity-lens-music
Diff against target: 138 lines (+17/-21)
4 files modified
src/banshee-scope.vala (+2/-1)
src/musicstore-collection.vala (+3/-12)
src/musicstore-scope.vala (+3/-2)
src/simple-scope.vala (+9/-6)
To merge this branch: bzr merge lp://qastaging/~brandontschaefer/unity-lens-music/cancellable-search
Reviewer Review Type Date Requested Status
Michal Hruby (community) Approve
Review via email: mp+91728@code.qastaging.launchpad.net

Description of the change

This fixes the problem when you search then delete your search; and the musicstore scope didn't update fast enough but the check for is_empty_search(search) was returning true so it leaves the scope around with results when it shouldn't.

Now musicstore-collections doesn't create its own Cancellable,it gets passed down through the search_changed signal in simple-scope.vala. So now a search can get cancelled if other searchs come in.

To post a comment you must log in.
Revision history for this message
Michal Hruby (mhr3) wrote :

Nice work, I have just one little thing to make it perfect:

8 - int max_results = -1)
9 + int max_results = -1,
10 + Cancellable cancellable)

(and other instances of the same) Please make the Cancellable nullable and null by default (ie -> "Cancellable? cancellable = null")

review: Needs Fixing
74. By Brandon Schaefer

Changes perform_search to default cancellable to null

Revision history for this message
Michal Hruby (mhr3) wrote :

Looks good.

review: Approve

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

to all changes: