Merge lp:~michael-sheldon/content-hub/fix-1377334 into lp:content-hub

Proposed by Michael Sheldon
Status: Merged
Approved by: Ken VanDine
Approved revision: 156
Merged at revision: 163
Proposed branch: lp:~michael-sheldon/content-hub/fix-1377334
Merge into: lp:content-hub
Diff against target: 12 lines (+1/-1)
1 file modified
import/Ubuntu/Content/ContentTransferHint.qml (+1/-1)
To merge this branch: bzr merge lp:~michael-sheldon/content-hub/fix-1377334
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ken VanDine Approve
Review via email: mp+238705@code.launchpad.net

Commit message

Set the caller on the ContentTransferHint dialog to allow it to be destroyed safely when its parent is destroyed.

Description of the change

Set the caller on the ContentTransferHint dialog to allow it to be destroyed safely when its parent is destroyed.

To post a comment you must log in.
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed UI labels, did you update the pot file?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
156. By Michael Sheldon

Merge from trunk

Revision history for this message
Ken VanDine (ken-vandine) wrote :

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
 * Yes, tested on mako. I didn't reproduce the crash and verified no regressions when transfers are canceled with the dialog open.

Did CI run pass? If not, please explain why.
 * They haven't run yet, this branch shouldn't affect them.

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
 * Yes

review: Approve
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Whoops, CI did run :)

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'import/Ubuntu/Content/ContentTransferHint.qml'
2--- import/Ubuntu/Content/ContentTransferHint.qml 2014-10-10 15:28:39 +0000
3+++ import/Ubuntu/Content/ContentTransferHint.qml 2014-10-17 13:01:44 +0000
4@@ -79,7 +79,7 @@
5
6 onIsTransferRunningChanged: {
7 if (isTransferRunning) {
8- dialogue = PopupUtils.open(dialog);
9+ dialogue = PopupUtils.open(dialog, root);
10 } else {
11 PopupUtils.close(dialogue);
12 }

Subscribers

People subscribed via source and target branches