Merge lp:~fboucault/unity-2d/more_soft_dep_on_unity2dapplication into lp:unity-2d/3.0

[Florian Boucault]

Prevent crash when using MouseArea and AbstractX11EventFilter without Unity2dApplication.
Remove duplicate code in LauncherApplicationsList: LauncherApplicationsList is a AbstractX11EventFilter.

[Olivier Tilloy (osomon)]

Looks good, makes sense and doesn’t seem to introduce regressions.

review: Approve

=== modified file 'libunity-2d-private/Unity2d/launcherapplicationslist.cpp'
--- libunity-2d-private/Unity2d/launcherapplicationslist.cpp	2011-06-08 10:15:49 +0000
+++ libunity-2d-private/Unity2d/launcherapplicationslist.cpp	2011-06-11 10:52:33 +0000
@@ -167,11 +167,6 @@
 
 LauncherApplicationsList::~LauncherApplicationsList()
 {
-    Unity2dApplication* application = Unity2dApplication::instance();
-    if (application != NULL) {
-        application->removeX11EventFilter(this);
-    }
-
     sn_monitor_context_unref(m_snContext);
     sn_display_unref(m_snDisplay);
 

=== modified file 'libunity-2d-private/src/mousearea.cpp'
--- libunity-2d-private/src/mousearea.cpp	2011-02-15 18:18:13 +0000
+++ libunity-2d-private/src/mousearea.cpp	2011-06-11 10:52:33 +0000
@@ -41,7 +41,14 @@
 : QObject(parent)
 , d(new MouseAreaPrivate)
 {
-    Unity2dApplication::instance()->installX11EventFilter(this);
+    Unity2dApplication* application = Unity2dApplication::instance();
+    if (application == NULL) {
+        /* This can happen for example when using qmlviewer */
+        UQ_WARNING << "The application is not an Unity2dApplication."
+                      "MouseArea disabled.";
+    } else {
+        application->installX11EventFilter(this);
+    }
 
     d->m_containsMouse = false;
 

=== modified file 'libunity-2d-private/src/unity2dapplication.cpp'
--- libunity-2d-private/src/unity2dapplication.cpp	2011-02-28 17:14:19 +0000
+++ libunity-2d-private/src/unity2dapplication.cpp	2011-06-11 10:52:33 +0000
@@ -26,7 +26,10 @@
 
 AbstractX11EventFilter::~AbstractX11EventFilter()
 {
-    Unity2dApplication::instance()->removeX11EventFilter(this);
+    Unity2dApplication* application = Unity2dApplication::instance();
+    if (application != NULL) {
+        application->removeX11EventFilter(this);
+    }
 }
 
 Unity2dApplication::Unity2dApplication(int& argc, char** argv)