compiz: Changes to 'master'

[Danny Baumann]

 src/screen.c |   28 ++++++++++++----------------
 src/window.c |   18 +++++++++++++++++-
 2 files changed, 29 insertions(+), 17 deletions(-)

New commits:
commit 5a9efaf6a44de5e4189619ec93cedbab9b217bc9
Merge: c0f31dd57a71e8f93a48772ba9340b9c14678e74 d2d25c7690330fc0d990a5e9992c80b9d6c57528
Author: Danny Baumann <dannybaumann at web.de>
Date:   Fri Sep 26 09:01:36 2008 +0200

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

commit c0f31dd57a71e8f93a48772ba9340b9c14678e74
Author: Danny Baumann <dannybaumann at web.de>
Date:   Thu Sep 25 09:42:19 2008 +0200

    Make viewportForGeometry not take the current viewport into account.
    As the geometry passed to viewportForGeometry is not necessarily a window, it doesn't make much sense to assume so.
    Instead, move the return-current-viewport-if-window-is-on-it logic to the defaultViewportForWindow function.

commit 98bdf75f332f04b670d36758e655eac8fa304f8d
Author: Danny Baumann <dannybaumann at web.de>
Date:   Wed Sep 24 15:03:59 2008 +0200

    Make sure geometry rectangle is kept inside the screen area.