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

[Michael Sheldon]

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

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

[Michael Sheldon (michael-sheldon)]

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:155
http://jenkins.qa.ubuntu.com/job/content-hub-ci/202/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-amd64-ci/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/59
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/59/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-i386-ci/59

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/202/rebuild

review: Approve (continuous-integration)

[lp:~michael-sheldon/content-hub/fix-1377334]

156. By Michael Sheldon on 2014-10-17

Merge from trunk

[Ken VanDine (ken-vandine)]

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

[Ken VanDine (ken-vandine)]

Whoops, CI did run :)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:156
http://jenkins.qa.ubuntu.com/job/content-hub-ci/203/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-amd64-ci/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/60
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/60/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-i386-ci/60

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/203/rebuild

review: Approve (continuous-integration)

=== modified file 'import/Ubuntu/Content/ContentTransferHint.qml'
--- import/Ubuntu/Content/ContentTransferHint.qml	2014-10-10 15:28:39 +0000
+++ import/Ubuntu/Content/ContentTransferHint.qml	2014-10-17 13:01:44 +0000
@@ -79,7 +79,7 @@
 
         onIsTransferRunningChanged: {
             if (isTransferRunning) {
-                dialogue = PopupUtils.open(dialog);
+                dialogue = PopupUtils.open(dialog, root);
             } else {
                 PopupUtils.close(dialogue);
             }