Merge lp:~bregma/compiz/lp-1085581 into lp:compiz/0.9.9

[Stephen M. Webb]

Move plugin initialization code out of assert() macro so it still runs even with NDEBUG defined (lp: #1085581).

= Problem description =

Plugins fail to run when compiz is build using the latest cmake.

= The fix =

Turns out the latest cmake adds a macro definition for NDEBUG when building in release mode (where previously it did not do so). That macro removes code inside an assert() macro, and plugin initialization code in compiz was wrapped in such a macro.

This fix moves that code outside of the macro and checks the result of the code in the macro instead.

= Test coverage =

Existing tests were failing: this change should cause those tests to pass once again.

[lp:~bregma/compiz/lp-1085581]

3501. By Stephen M. Webb on 2012-12-04

Used the new variables so -Wno-unused does not cause trouble with -DNDEBUG.

[Didier Roche (didrocks)]

Way saner.

review: Approve

[Daniel van Vugt (vanvugt)]

WTF!? Who put important code inside asserts?

[Sam Spilsbury (smspillaz)]

We should probably check the other asserts in the source tree too -
we've been bitten by this change in a few areas now.

On Wed, Dec 5, 2012 at 9:14 AM, Daniel van Vugt
<email address hidden> wrote:
> WTF!? Who put important code inside asserts?
> --
> https://code.launchpad.net/~bregma/compiz/lp-1085581/+merge/137880
> Your team Compiz Maintainers is subscribed to branch lp:compiz.

--
Sam Spilsbury

[Daniel van Vugt (vanvugt)]

I have searched the whole source tree. These two locations are the only dangerous asserts.

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2012-12-02 18:28:53 +0000
+++ src/screen.cpp	2012-12-04 16:11:25 +0000
@@ -5077,7 +5077,10 @@
      * plugins loaded on the command line screen's and then
      * we need to call updatePlugins () to init the remaining
      * screens from option changes */
-    assert (CompPlugin::screenInitPlugins (screen));
+    bool init_succeeded = CompPlugin::screenInitPlugins (screen);
+    assert (init_succeeded);
+    if (!init_succeeded)
+      return false;
 
     /* The active plugins list might have been changed - load any
      * new plugins */

=== modified file 'src/window.cpp'
--- src/window.cpp	2012-11-29 08:14:03 +0000
+++ src/window.cpp	2012-12-04 16:11:25 +0000
@@ -6115,7 +6115,10 @@
     }
 
     /* TODO: bailout properly when objectInitPlugins fails */
-    assert (CompPlugin::windowInitPlugins (this));
+    bool init_succeeded = CompPlugin::windowInitPlugins (this);
+    assert (init_succeeded);
+    if (!init_succeeded)
+      return;
 
     recalcActions ();
     priv->updateIconGeometry ();