Merge lp:~bilalakhtar/unity/fix-sc-launcher-integration into lp:unity

[Bilal Akhtar]

This is a one-line change to fix SC launcher integration (bug #761851).

Since SC Launcher integration phase 1 landed before Unity 5.2.0, this change doesn't need a UIFe. This branch merely fixes the integration. Please ensure it lands before Unity 5.6.0.

[Tim Penhey (thumper)]

On Tue 21 Feb 2012 13:01:30 NZDT, Bilal Akhtar wrote:
> Bilal Akhtar has proposed merging lp:~bilalakhtar/unity/fix-sc-launcher-integration into lp:unity.
>
> Requested reviews:
> Unity Team (unity-team)
> Related bugs:
> Bug #761851 in unity: "Software Centre - automatically add app icon to launcher"
> https://bugs.launchpad.net/unity/+bug/761851
>
> For more details, see:
> https://code.launchpad.net/~bilalakhtar/unity/fix-sc-launcher-integration/+merge/93908
>
> This is a one-line change to fix SC launcher integration (bug #761851).

Do we have a test for this?

Or put another way, how can we easily add a test for this?

[Bilal Akhtar (bilalakhtar)]

I don't think this is likely to break again. When LauncherController was revamped, this line was mistakenly deleted by someone else. That shouldn't happen again, I hope.

[Bilal Akhtar (bilalakhtar)]

Okay, as it appears, this branch got flooded by mistake with some recent changes which should be part of another branch. While I solve things up, i'm closing this merge request.

[Bilal Akhtar (bilalakhtar)]

This branch is okay for getting merged again. Please review!

[Mirco Müller (macslow)]

Branch works as advertised and fixes LP: #932280. But it does not have any kind of test coming with it. Adding at least a manual test (e.g. derived from case stated in the bug-description) would be better than nothing. The nature of this feature makes it a bit hard to provide an automated (autopilot) test.

review: Needs Fixing

[Alex Launi (alexlauni)]

This sort of fix doesn't require a test. There is an autopilot test for the feature overall on Bilal's other branch, https://code.launchpad.net/~bilalakhtar/unity/sc-integration-phase2/+merge/95795

review: Approve

[Bilal Akhtar (bilalakhtar)]

Also, as it turns out, the autopilot test on that branch covers this line as well. So once that branch gets in (which should happen either today or tomorrow), the tests for this line will be covered too. If this line breaks in the future, or anything on the way, then that test would start to fail.

=== modified file 'plugins/unityshell/src/LauncherController.cpp'
--- plugins/unityshell/src/LauncherController.cpp	2012-02-29 17:05:43 +0000
+++ plugins/unityshell/src/LauncherController.cpp	2012-03-03 01:30:24 +0000
@@ -326,6 +326,7 @@
 
   launcher->SetModel(model_.get());
   launcher->launcher_addrequest.connect(sigc::mem_fun(this, &Impl::OnLauncherAddRequest));
+  launcher->launcher_addrequest_special.connect(sigc::mem_fun(this, &Impl::OnLauncherAddRequestSpecial));
   launcher->launcher_removerequest.connect(sigc::mem_fun(this, &Impl::OnLauncherRemoveRequest));
 
   parent_->AddChild(launcher);