unity-scopes-shell

Merge lp://qastaging/~stolowski/unity-scopes-shell/fix-1484299-vivid into lp://qastaging/unity-scopes-shell/trunk-15.04

  1. fix-1484299-vivid
  2. Merge into trunk-15.04
Proposed by Paweł Stołowski
Status: Merged
Approved by: Marcus Tomlinson
Approved revision: 255
Merged at revision: 246
Proposed branch: lp://qastaging/~stolowski/unity-scopes-shell/fix-1484299-vivid
Merge into: lp://qastaging/unity-scopes-shell/trunk-15.04
Diff against target: 166 lines (+61/-2)
5 files modified
src/Unity/scope.cpp (+23/-1)
src/Unity/scope.h (+2/-0)
src/Unity/scopes.cpp (+4/-0)
src/Unity/settingsmodel.cpp (+29/-1)
src/Unity/settingsmodel.h (+3/-0)
To merge this branch: bzr merge lp://qastaging/~stolowski/unity-scopes-shell/fix-1484299-vivid
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Marcus Tomlinson (community) Approve
Review via email: mp+268349@code.qastaging.launchpad.net

Commit message

Fix crash when aggregator's settings view is opened shortly after a new child scope was installed. Fix invalidating of results in temp scopes.

Description of the change

Fix crash when aggregator's settings view is opened shortly after a new child scope was installed. There is a short window (5 seconds) where child scopes list can contain a just installed scope but scopes metadata hasn't been refreshed yet and doesn't know that scope id. If that situation is detected, mark settings as needing refreshing, and re-populate settings model after we have all the new metadata from the registry.

Also fixed invalidating of results in temp scopes (lines 71-74).

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:254
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-trunk-15.04-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-trunk-15.04-vivid-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-trunk-15.04-vivid-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-trunk-15.04-vivid-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-trunk-15.04-vivid-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-trunk-15.04-ci/3/rebuild

review: Approve (continuous-integration)
Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

Did you intend to leave all those qDebug()'s in the code?

review: Needs Information
lp://qastaging/~stolowski/unity-scopes-shell/fix-1484299-vivid updated
255. By Paweł Stołowski

Removed debug messages

Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

Looks good.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:255
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-trunk-15.04-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-trunk-15.04-vivid-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-trunk-15.04-vivid-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-trunk-15.04-vivid-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-trunk-15.04-vivid-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-trunk-15.04-ci/4/rebuild

review: Approve (continuous-integration)

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: