compiz: Changes to 'master'

[Mike Dransfield]

 plugins/rotate.c |    6 -
 plugins/scale.c  |    3 
 src/display.c    |   29 +++++--
 src/event.c      |  216 +++++++++++++++++++++++++++++--------------------------
 4 files changed, 143 insertions(+), 111 deletions(-)

New commits:
commit 23d1789c75da55d95b74d812812db2c1c889ed34
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Mon May 21 19:42:45 2007 +0100

    Revert "Make minimize, maximize, unmaximize and close window actions"
    
    This reverts commit 1580a740c9871114e52c7322eefdd11b30e59b25.

commit 8a3187f7f8e3f29b45d87c11f908cc8aed131221
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Mon May 21 19:42:12 2007 +0100

    Revert "Use active window rather than the action window for scale_group"
    
    This reverts commit 7a7109529074bf06f0dedeeb3475b0d79e9c152b.

commit 16c94e8ec5b9d5add7c979eb3bb2c507438557d4
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Mon May 21 19:39:52 2007 +0100

    Add event_window to list of options passed to an action initiate
    function.  This contains the underlying event window.
    
    Window will now contain the active window if an action is initiated
    with edge + edgebutton

commit 19c9910160b3dd02c680106f79c90eea5bf6c810
Merge: fb75078... fa8a12e...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Mon May 21 19:19:03 2007 +0100

    Merge branch 'master' of git://git.freedesktop.org/git/xorg/app/compiz

commit fb75078b7ece1a44ff8eef7a430504644e81af1d
Merge: 95031b0... 1e5ca8a...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Wed May 16 01:40:53 2007 +0100

    Merge branch 'master' of git://git.freedesktop.org/git/xorg/app/compiz

commit 95031b0979774008340cc08e6255bef5262a8a36
Merge: f527385... 48ddb2e...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Thu May 10 14:34:29 2007 +0000

    Merge branch 'master' of git://git.freedesktop.org/git/xorg/app/compiz

commit f527385adbd8724bb96747092d86f3321a16a94c
Merge: be66a46... d9bd3ba...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Fri May 4 16:15:27 2007 +0100

    Merge branch 'master' of git://git.freedesktop.org/git/xorg/app/compiz

commit be66a46c79be61ca67246cd41ab418b4be56e023
Merge: e3c0857... 9743dc7...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Thu May 3 16:19:04 2007 +0100

    Merge branch 'master' of git://git.freedesktop.org/git/xorg/app/compiz

commit e3c085728fb4681a51ee47abd24cc1ae7c8cdb41
Merge: 82ab3b0... 572f759...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Sun Apr 29 19:59:10 2007 +0100

    Merge branch 'master' of git://git.freedesktop.org/git/xorg/app/compiz

commit 82ab3b04f699ec49ed84286ad3858e5e2f4d2c4b
Merge: 5eb33b7... e49fbce...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Sun Apr 29 15:44:09 2007 +0100

    Merge branch 'master' of git://git.freedesktop.org/git/xorg/app/compiz

commit 5eb33b715d05c8f102734ce039368009f489143d
Merge: a319d58... 5a7eedc...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Wed Apr 25 00:53:46 2007 +0100

    Merge branch 'master' of git://git.freedesktop.org/git/xorg/app/compiz

commit a319d58ae7321d5bea04cdc198f46f3f6114f693
Merge: 910b041... 701b49b...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Mon Apr 23 17:21:37 2007 +0100

    Merge branch 'master' of git://git.freedesktop.org/git/xorg/app/compiz

commit 910b041f7cabe8831a1ad4e96c324ed0f0493a2a
Merge: 794a341... baed3a2...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Fri Apr 20 16:26:19 2007 +0100

    Merge branch 'master' of git://git.freedesktop.org/git/xorg/app/compiz

commit 794a34196878f3b24fae86d1961137593a141b2e
Merge: aca8879... 2ca7779...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Thu Apr 19 19:29:09 2007 +0100

    Merge branch 'master' of git://git.freedesktop.org/git/xorg/app/compiz

commit aca887974013f6d70ee970f87cc9276092cd728e
Merge: b05b63d... 6f1b4d6...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Wed Apr 18 17:54:50 2007 +0100

    Merge branch 'master' of git://git.freedesktop.org/git/xorg/app/compiz

commit b05b63d0cca1ab9dab472b75acca80df02044ac0
Merge: 499ec53... 90dd79d...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Tue Apr 17 09:15:18 2007 +0100

    Merge branch 'master' of git://git.freedesktop.org/git/xorg/app/compiz

commit 499ec5365265f55edebb9b4276784612b341a8e7
Merge: 58cf63b... 376a94a...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Sun Apr 15 15:19:21 2007 +0100

    Merge branch 'master' of git://git.freedesktop.org/git/xorg/app/compiz

commit 58cf63ba67f055f89f156940d0bd2aef65f02574
Merge: 7c4262b... 5f0f272...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Thu Apr 12 20:48:00 2007 +0100

    Merge branch 'master' of git://git.freedesktop.org/git/xorg/app/compiz

commit 7c4262bca5afe666735c79bc22729d57521c3e61
Merge: 518a9b4... 7841367...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Thu Apr 12 17:50:07 2007 +0100

    Merge branch 'master' of git://git.freedesktop.org/git/xorg/app/compiz

commit 518a9b4c3cae0a2598b1e8c5c0fb6222644b5e84
Merge: 8ab3cf4... 26b1edf...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Thu Apr 12 12:21:48 2007 +0100

    Merge branch 'master' of git://git.freedesktop.org/git/xorg/app/compiz

commit 8ab3cf4ad71788d98af8a1b881b0d8612769dc4e
Merge: f2773cb... 9b0eae5...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Wed Apr 11 18:24:56 2007 +0100

    Merge branch 'master' of git://git.freedesktop.org/git/xorg/app/compiz

commit f2773cb4a9920976a2cb7729be5db49b6f2f31f0
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Mon Apr 9 18:09:11 2007 +0100

    Regenerate schemas