compiz: Changes to 'master'

[Danny Baumann]

 include/compiz-core.h |   23 +++++++++++------------
 metadata/core.xml.in  |    8 ++++++--
 plugins/annotate.c    |    2 +-
 plugins/blur.c        |   20 ++++++++++----------
 plugins/cube.c        |    2 +-
 plugins/dbus.c        |    8 ++++----
 plugins/decoration.c  |    2 +-
 plugins/ini.c         |   30 +++++++++++++++---------------
 plugins/regex.c       |    2 +-
 plugins/screenshot.c  |    2 +-
 plugins/video.c       |    9 ++++-----
 plugins/water.c       |    4 ++--
 src/core.c            |    5 +++--
 src/display.c         |   32 +++++++++++++++-----------------
 src/fragment.c        |    6 +++---
 src/main.c            |   21 ++++++++++++---------
 src/metadata.c        |    6 +++---
 src/plugin.c          |   19 +++++++++----------
 src/screen.c          |   35 ++++++++++++++++-------------------
 src/session.c         |    2 +-
 src/texture.c         |    6 +++---
 src/window.c          |   22 +++++++++++++++++-----
 22 files changed, 139 insertions(+), 127 deletions(-)

New commits:
commit 839122dcdb592adc0aa1040d42c9c3f064272f16
Merge: 0d71c5e3cfd7fe0ae30f97dc0ba549bed035428d 41353bae026fbd12b222e21151310e80844e2b13
Author: Danny Baumann <dannybaumann at web.de>
Date:   Mon Sep 1 09:15:09 2008 +0200

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

commit 0d71c5e3cfd7fe0ae30f97dc0ba549bed035428d
Author: Danny Baumann <dannybaumann at web.de>
Date:   Thu Aug 28 14:10:44 2008 +0200

    Made logMessage a wrappable core (instead of display) function.

commit eacc4339fef37a314e5931c68647e601db569458
Author: Danny Baumann <dannybaumann at web.de>
Date:   Thu Aug 28 13:41:35 2008 +0200

    Improve focus stealing prevention.
    - Allow window focus if currently no window or only the desktop window is focussed.
    - Rename mode "High" to "Normal" and introduce "High" mode that denies focus attempts of windows not belonging to the active application.
    - Allow focus attempts of windows of the same application in Low, Normal, High modes.