Merge lp:~gerboland/unity-2d/bug-845979-fix into lp:unity-2d

[Gerry Boland]

[panel] LegacyTray: A new FdoTask is created for every app that wants a tray icon, but the whitelist only allows some of them to draw a widget. When FdoTask is destroyed, only want to delete those widgets which are created. Fix bug:845979

I would appreciate any other opinions on this, as I don't really like this fix. I'm not convinced the legacytray is working at all, see bug:779382

[Alberto Mardegan (mardy)]

Thanks Gerry! This patch is indeed correct and necessary. I'm not sure if it's enough to fix the bug, but this must absolutely go in. :-)

review: Approve

[Alberto Mardegan (mardy)]

ops, forgot to comment about the style: please use "if (m_widget != 0) {".

review: Needs Fixing

[lp:~gerboland/unity-2d/bug-845979-fix]

736. By Gerry Boland on 2011-09-26

Fix to follow style guidelines.

[Gerry Boland (gerboland)]

That was sloppy of me, style now fixed.

review: Needs Resubmitting

[Alberto Mardegan (mardy)]

Great Gerry! :-)

review: Approve

=== modified file 'panel/applets/legacytray/fdotask.cpp'
--- panel/applets/legacytray/fdotask.cpp	2011-09-01 09:03:12 +0000
+++ panel/applets/legacytray/fdotask.cpp	2011-09-26 08:56:24 +0000
@@ -50,7 +50,9 @@
 FdoTask::~FdoTask()
 {
     taskDeleted(m_id);
-    m_widget->deleteLater();
+    if (m_widget != NULL) {
+        m_widget->deleteLater();
+    }
 }
 
 void FdoTask::createWidget()