Merge lp:~unity-team/unity/unity.fix-lp729715 into lp:unity

[Jason Smith]

[Jay Taoko (jaytaoko)]

Approved

review: Approve

=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2011-03-31 07:08:44 +0000
+++ src/Launcher.cpp	2011-03-31 17:45:48 +0000
@@ -278,7 +278,6 @@
     m_LastSpreadIcon = NULL;
 
     _current_icon       = NULL;
-    _last_selected_icon = NULL;
     _current_icon_index = -1;
     _last_icon_index    = -1;
 
@@ -2011,6 +2010,21 @@
     if (icon->needs_redraw_connection.connected ())
       icon->needs_redraw_connection.disconnect ();
 
+    if (icon == _current_icon)
+      _current_icon = 0;
+    if (icon == m_ActiveTooltipIcon)
+      m_ActiveTooltipIcon = 0;
+    if (icon == m_ActiveMenuIcon)
+      m_ActiveMenuIcon = 0;
+    if (icon == m_LastSpreadIcon)
+      m_LastSpreadIcon = 0;
+    if (icon == _icon_under_mouse)
+      _icon_under_mouse = 0;
+    if (icon == _icon_mouse_down)
+      _icon_mouse_down = 0;
+    if (icon == _drag_icon)
+      _drag_icon = 0;
+
     icon->UnReference ();
     EnsureAnimation();
     RemoveChild (icon);
 
=== modified file 'src/Launcher.h'
--- src/Launcher.h	2011-03-30 09:34:07 +0000
+++ src/Launcher.h	2011-03-31 17:45:48 +0000
@@ -382,13 +382,15 @@
   nux::HLayout* m_Layout;
   int m_ContentOffsetY;
 
+  // used by keyboard/a11y-navigation
+  LauncherIcon* _current_icon;
   LauncherIcon* m_ActiveTooltipIcon;
   LauncherIcon* m_ActiveMenuIcon;
   LauncherIcon* m_LastSpreadIcon;
+  LauncherIcon* _icon_under_mouse;
+  LauncherIcon* _icon_mouse_down;
+  LauncherIcon* _drag_icon;
 
-  // used by keyboard/a11y-navigation
-  LauncherIcon* _current_icon;
-  LauncherIcon* _last_selected_icon;
   int           _current_icon_index;
   int           _last_icon_index;
 
@@ -413,11 +415,7 @@
   LauncherActionState _launcher_action_state;
   LaunchAnimation _launch_animation;
   UrgentAnimation _urgent_animation;
-  AutoHideAnimation _autohide_animation;
-  
-  LauncherIcon* _icon_under_mouse;
-  LauncherIcon* _icon_mouse_down;
-  LauncherIcon* _drag_icon;
+  AutoHideAnimation _autohide_animation;  
 
   int _space_between_icons;
   int _icon_size;