Merge lp:~saviq/unity-2d/fix-panel-leak into lp:unity-2d

[Michał Sawicz]

[panel] destroy entries removed from MenuBarWidget

Free memory used by the entries.
Fixes https://bugs.launchpad.net/unity-2d/+bug/850320
Kudos to @fboucault.

[Florian Boucault (fboucault)]

the delete needs to happen in the destructor of MenuBarWidget as well. Using qDeleteAll should do.

review: Needs Fixing

[lp:~saviq/unity-2d/fix-panel-leak]

727. By Michał Sawicz on 2011-09-16

[panel] destroy the list of widget upon MenuBarWidget destruction

[Michał Sawicz (saviq)]

Done.

=== modified file 'panel/applets/appname/menubarwidget.cpp'
--- panel/applets/appname/menubarwidget.cpp	2011-09-09 02:23:30 +0000
+++ panel/applets/appname/menubarwidget.cpp	2011-09-16 14:54:26 +0000
@@ -54,6 +54,11 @@
     m_layout->addStretch();
 }
 
+MenuBarWidget::~MenuBarWidget()
+{
+    qDeleteAll(m_widgetList);
+}
+
 bool MenuBarWidget::isEmpty() const
 {
     return m_isEmpty;
@@ -117,6 +122,7 @@
             m_layout->removeWidget(widget);
             m_indicatorsManager->removeIndicatorEntryWidget(widget);
             m_widgetList.removeOne(widget);
+            delete widget;
             updateIsEmpty();
             break;
         }

=== modified file 'panel/applets/appname/menubarwidget.h'
--- panel/applets/appname/menubarwidget.h	2011-09-09 02:23:30 +0000
+++ panel/applets/appname/menubarwidget.h	2011-09-16 14:54:26 +0000
@@ -41,6 +41,7 @@
 Q_OBJECT
 public:
     MenuBarWidget(IndicatorsManager*, QWidget* parent = 0);
+    ~MenuBarWidget();
 
     bool isEmpty() const;
     bool isOpened() const;