Merge lp:~uriboni/unity-2d/panel-segv-logoff into lp:unity-2d/3.0

[Ugo Riboni]

[panel] Fix a bug when exiting the panel cleanly (i.e. on logoff)

[Aurélien Gâteau (agateau)]

Sorry but that fix is wrong: it causes the filter to be leaked because it is never deleted.

It does not matter much to the end user but this kind of errors leads to more false positives when hunting for memleaks with valgrind. It also could come back for other X11EventFilters. A better fix would be to delete all filters in Unity2dApplication destructor with:

  qDeleteAll(m_x11EventFilters);

This should fix the problem because right now the filters are deleted by the QObject destructor of Unity2dApplication. At this point the m_x11EventFilters list does not exist anymore, hence the crash. Deleting filters in Unity2dApplication destructor will ensure filters are deleted *before* the m_x11EventFilters list is deleted.

(Oh, and this could quite easily be unit-tested I think)

review: Needs Fixing

=== modified file 'libunity-2d-private/src/keyboardmodifiersmonitor.cpp'
--- libunity-2d-private/src/keyboardmodifiersmonitor.cpp	2011-01-26 15:50:26 +0000
+++ libunity-2d-private/src/keyboardmodifiersmonitor.cpp	2011-02-25 18:02:14 +0000
@@ -51,17 +51,22 @@
     int m_modifiers;
 };
 
-KeyboardModifiersMonitor::KeyboardModifiersMonitor(QObject* parent)
-: QObject(parent)
+KeyboardModifiersMonitor::KeyboardModifiersMonitor()
+: QObject(NULL)
 , d(new KeyboardModifiersMonitorPrivate)
 {
     if (sXkbBaseEventType == 0) {
         setupXkb();
     }
 
-    Unity2dApplication* app = Unity2dApplication::instance();
-    Q_ASSERT(app);
-    Unity2dApplication::instance()->installX11EventFilter(this);
+    Unity2dApplication* application;
+    application = qobject_cast<Unity2dApplication*>(QApplication::instance());
+    if (application == NULL) {
+        qWarning() << "The application is not an Unity2dApplication."
+                      "Modifiers will not be monitored.";
+    } else {
+        Unity2dApplication::instance()->installX11EventFilter(this);
+    }
 }
 
 KeyboardModifiersMonitor::~KeyboardModifiersMonitor()
@@ -71,7 +76,7 @@
 
 KeyboardModifiersMonitor* KeyboardModifiersMonitor::instance()
 {
-    static KeyboardModifiersMonitor* monitor = new KeyboardModifiersMonitor(Unity2dApplication::instance());
+    static KeyboardModifiersMonitor* monitor = new KeyboardModifiersMonitor();
     return monitor;
 }
 

=== modified file 'libunity-2d-private/src/keyboardmodifiersmonitor.h'
--- libunity-2d-private/src/keyboardmodifiersmonitor.h	2011-01-26 15:50:26 +0000
+++ libunity-2d-private/src/keyboardmodifiersmonitor.h	2011-02-25 18:02:14 +0000
@@ -42,7 +42,7 @@
 {
 Q_OBJECT
 public:
-    KeyboardModifiersMonitor(QObject* parent=0);
+    KeyboardModifiersMonitor();
     ~KeyboardModifiersMonitor();
 
     Qt::KeyboardModifiers keyboardModifiers() const;