Merge lp:~nick-dedekind/unity/lp1055995.launcher-icon-expo-terminate into lp:unity

[Nick Dedekind]

Added launcher icon destructor disconnect from expo termination signal.

Added launcher icon destructor disconnect from expo termination signal.

[Nick Dedekind (nick-dedekind)]

From the Stack-trace in the bug, it looks like the quicklist has been destroyed; in which case the LauncherIcon has been.

In theory, the following could have happened, although I had not been able to reproduce it:
1) Workspace switcher is opened
2) User right-click on icon for quicklist.
3) Expo is closed by quicklist request.
4) Aysnchronously, the icon is removed from the launcher (possibly uninstalled/user removed ?)
5) quicklist is opened.

[Marco Trevisan (Treviño) (3v1n0)]

Looks fair

review: Approve

[Timo Jyrinki (timo-jyrinki)]

Please propose for merging into lp:unity/6.0 as well right away.

[Nick Dedekind (nick-dedekind)]

https://code.launchpad.net/~nick-dedekind/nux/lp1057995.mouse-drag-delta/+merge/127220

[Nick Dedekind (nick-dedekind)]

sorry, wrong one.
https://code.launchpad.net/~nick-dedekind/unity/lp1055995.launcher-icon-expo-terminate-6.0/+merge/127265

=== modified file 'launcher/LauncherIcon.cpp'
--- launcher/LauncherIcon.cpp	2012-09-18 03:18:11 +0000
+++ launcher/LauncherIcon.cpp	2012-10-01 09:22:24 +0000
@@ -136,6 +136,9 @@
   if (on_order_changed_connection.connected())
     on_order_changed_connection.disconnect();
 
+  if (on_expo_terminated_connection.connected())
+    on_expo_terminated_connection.disconnect();
+
   if (_unity_theme)
   {
     _unity_theme = NULL;