Merge lp:~gerboland/unity-2d/fix-onActiveWorkspaceChanged-crash into lp:unity-2d

[Gerry Boland]

[launcher] When item removed from launcher list model, the delegates is not removed immediately, but delayed so the closing animation can complete. Prevent accessing the model item while delegate removal is being delayed. Fixes multiple crashes.

[launcher] When item removed from launcher list model, the delegates is not removed immediately, but delayed so the closing animation can complete. Prevent accessing the model item while delegate removal is being delayed. Fixes multiple crashes.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1154
http://s-jenkins:8080/job/unity-2d-ci/30/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-2d-ci/./distribution=precise,flavor=amd64/30/console
    SUCCESS: http://s-jenkins:8080/job/unity-2d-ci/./distribution=precise,flavor=i386/30/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-2d-ci/30//rebuild/?

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

Makes sense

review: Approve

=== modified file 'shell/launcher/LauncherList.qml'
--- shell/launcher/LauncherList.qml	2012-05-24 13:21:20 +0000
+++ shell/launcher/LauncherList.qml	2013-02-21 17:41:34 +0000
@@ -372,6 +372,8 @@
         Connections {
             target: declarativeView
             onActivateShortcutPressed: {
+                if (launcherItem.ListView.delayRemove) return /* This method could be called after item deleted */
+
                 /* Only applications can be launched by keyboard shortcuts */
                 if (item.toString().indexOf("Application") == 0 && index == itemIndex) {
                     item.menu.hide()
@@ -379,6 +381,8 @@
                 }
             }
             onNewInstanceShortcutPressed: {
+                if (launcherItem.ListView.delayRemove) return
+
                 /* Only applications can be launched by keyboard shortcuts */
                 if (item.toString().indexOf("Application") == 0 && index == itemIndex) {
                     item.menu.hide()
@@ -389,11 +393,11 @@
 
         Connections {
             target: shellManager
-            onActiveWorkspaceChanged: updatePips()
+            onActiveWorkspaceChanged: if (!launcherItem.ListView.delayRemove) updatePips()
         }
         Connections {
             target: declarativeView.screen
-            onGeometryChanged: updatePips()
+            onGeometryChanged: if (!launcherItem.ListView.delayRemove) updatePips()
         }
         Component.onCompleted: updatePips()
     }