Merge lp:~aacid/unity-2d/barrier_creation_can_fail into lp:unity-2d

[Albert Astals Cid]

Pointer barrier creation can fail, don't crash if that happens

Pointer barrier creation can fail, don't crash if that happens
UNBLOCK

=== modified file 'libunity-2d-private/src/pointerbarrier.cpp'
--- libunity-2d-private/src/pointerbarrier.cpp	2012-04-03 08:33:04 +0000
+++ libunity-2d-private/src/pointerbarrier.cpp	2012-04-26 09:58:19 +0000
@@ -21,6 +21,8 @@
 
 // libunity-2d
 #include "pointerbarriermanager.h"
+#include "config.h"
+#include "debug_p.h"
 
 // Self
 #include "pointerbarrier.h"
@@ -185,7 +187,10 @@
                     m_threshold,
                     0,
                     NULL);
-    Q_ASSERT(m_barrier != 0);
+    if (m_barrier == 0) {
+        UQ_WARNING << "Pointer barrier creation failed. This can happen when using a non standard X server, autohiding launcher and sticky edges won't be available.";
+        launcher2dConfiguration().setProperty("hideMode", 0);
+    }
 }
 
 void PointerBarrierWrapper::destroyBarrier()

=== modified file 'tests/manual-tests/other.txt'
--- tests/manual-tests/other.txt	2012-04-03 09:58:39 +0000
+++ tests/manual-tests/other.txt	2012-04-26 09:58:19 +0000
@@ -14,3 +14,8 @@
  * Disable sticky edges
 
 -> Verify that there is no mouse barrier between the two screens
+----
+ * Log in into a machine that uses NX (or any X server that does not support PointerBarriers)
+ * Set the launcher to autohide
+
+-> Verify that there is no crash and the launcher is set back always shown