Merge lp:~smspillaz/compiz-core/compiz-core.fix_891591 into lp:compiz-core/0.9.5

[Sam Spilsbury]

    Mark screen as initialized before initializing windows as windowInitPlugins
    may implicitly call the constructor of a PluginScreen and likely PluginOptions
    which will try to register actions and will silently fail

    eg,

    windowInitPlugins -> PluginWindow::PluginWindow -> PluginScreen::get () ->
    PluginScreen::PluginScreen -> PluginOptions::PluginOptions ->
    CompScreen::addAction

This should fix bug 896591

Next lp:~smspillaz/compiz-core/fix_896586_rotate_plugin

[Daniel van Vugt (vanvugt)]

I don't need to fully understand this code to say:

1. The change to src/window.cpp looks like a mistake so should be removed.

2. Are you sure this proposal fixes bug 891591? Or is that a typo and its meant to fix a different bug?

review: Needs Fixing

[Sam Spilsbury (smspillaz)]

> I don't need to fully understand this code to say:
>
> 1. The change to src/window.cpp looks like a mistake so should be removed.

Ack

>
> 2. Are you sure this proposal fixes bug 891591? Or is that a typo and its
> meant to fix a different bug?

Right, it should be bug 896591 . That was a typo

[Tim Penhey (thumper)]

Really this change shouldn't be a part of the pipeline.

How would you confirm the fix in a test if you were to write a test manual or otherwise?

[Sam Spilsbury (smspillaz)]

compiz --replace composite opengl move resize cube rotate

Then try and switch desktops with the default keybindings (eg ctrl-alt-left / ctrl-alt-right).

The problem was that in the case where you're loading plugins on the command line (as I was), those plugins will always all be loaded at once, as compared to using compizconfig where they are loaded sequentially a little after compizconfig starts up (eg on a zero-timer).

It's a very small thing, but something I noticed as I was making changes, so thats why I fixed it.

[lp:~smspillaz/compiz-core/compiz-core.fix_891591]

2942. By Sam Spilsbury on 2012-01-13

Merged compiz-core.fix_894688 into compiz-core.fix_891591.

[Daniel van Vugt (vanvugt)]

Approved. I couldn't find the exact revision of the below diff. But applying it manually and using the above test case seems to work.

review: Approve

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2012-01-13 16:36:41 +0000
+++ src/screen.cpp	2012-01-13 16:36:41 +0000
@@ -4659,6 +4659,7 @@
     XSync (dpy, FALSE);
 
     /* Start initializing windows here */
+    priv->initialized = true;
 
     for (unsigned int i = 0; i < nchildren; i++)
     {
@@ -4723,8 +4724,6 @@
     priv->vpSize.setWidth (priv->optionGetHsize ());
     priv->vpSize.setHeight (priv->optionGetVsize ());
 
-    priv->initialized = true;
-
     /* TODO: Bailout properly when screenInitPlugins fails
      * TODO: It would be nicer if this line could mean
      * "init all the screens", but unfortunately it only inits