Merge lp:~mzanetti/unity8/fix-1347902 into lp:unity8

[Michael Zanetti]

properly parent launcher items

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

No

 * Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

 * Did you make sure that your branch does not contain spurious tags?

Yep

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

Nope

 * If you changed the UI, has there been a design review?

Nope

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1070
http://jenkins.qa.ubuntu.com/job/unity8-ci/3567/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/2415
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/569
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/661
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/661
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/661/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/661
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/2586
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3646
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3646/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10330

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/3567/rebuild

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

LGTM

== Checklist ==

 * Did you perform an exploratory manual test run of the code change and any related functionality?
 - Could not reproduce the bug, but the change makes sense

 * Did CI run pass? If not, please explain why.
 - Not quite. We seem to be having some reliable testing problems.

review: Approve

=== modified file 'plugins/Unity/Launcher/launchermodel.cpp'
--- plugins/Unity/Launcher/launchermodel.cpp	2014-07-03 12:03:57 +0000
+++ plugins/Unity/Launcher/launchermodel.cpp	2014-07-24 06:49:50 +0000
@@ -141,7 +141,8 @@
         beginInsertRows(QModelIndex(), index, index);
         LauncherItem *item = new LauncherItem(appId,
                                               m_backend->displayName(appId),
-                                              m_backend->icon(appId));
+                                              m_backend->icon(appId),
+                                              this);
         item->setPinned(true);
         m_list.insert(index, item);
         endInsertRows();
@@ -326,7 +327,7 @@
     if (found) {
         // Shall we paint some running/recent app highlight? If yes, do it here.
     } else {
-        LauncherItem *item = new LauncherItem(app->appId(), app->name(), app->icon().toString());
+        LauncherItem *item = new LauncherItem(app->appId(), app->name(), app->icon().toString(), this);
         item->setRecent(true);
         item->setFocused(app->focused());