compiz: Changes to 'master'

[Danny Baumann]

 plugins/decoration.c |   27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

New commits:
commit 09420b68798704149075f3068a6a681edf66d597
Merge: 61b737fe7c2d1e7d2bb00e87835f03038d4ba497 ce7b310c149c4ceb4d5c3ce7e3bf3af65db80616
Author: Danny Baumann <dannybaumann at web.de>
Date:   Mon Sep 15 17:02:43 2008 +0200

    Merge branch 'master' of git+ssh://maniac@git.freedesktop.org/git/xorg/app/compiz

commit 61b737fe7c2d1e7d2bb00e87835f03038d4ba497
Author: Danny Baumann <dannybaumann at web.de>
Date:   Mon Sep 15 17:02:22 2008 +0200

    Use timer to start decorator.
    When starting the decorator from initScreen, user changes to a default decorator command are not reflected correctly. When starting it _only_ from the option change notification, no decorator is started if the default is non-empty and the user never changed it.
    Compromise is using a timer and hoping that the configuration plugin has initialized all options at next mainloop iteration time (which is the case for all known configuration plugins).