[gtk+/quartz-integration: 36/36] Merge branch 'master' into quartz-integration

[John Ralls <jralls src gnome org>]

commit 8470e70a4e0f43ce9986eb0d214925035bffeaa0
Merge: 71ff557 955f01c
Author: John Ralls <jralls ceridwen us>
Date:   Thu Apr 7 23:21:23 2011 -0700

    Merge branch 'master' into quartz-integration

 gdk/broadway/Makefile.am             |   11 +-
 gdk/broadway/broadway-demo.c         |    2 +-
 gdk/broadway/broadway.c              |   64 ++--
 gdk/broadway/broadway.h              |   16 +-
 gdk/broadway/broadway.js             |  581 +++++++++++++++++++++++++---------
 gdk/broadway/gdkbroadway.h           |   41 +++
 gdk/broadway/gdkbroadwaycursor.h     |    4 +-
 gdk/broadway/gdkbroadwaywindow.h     |    2 +
 gdk/broadway/gdkdevice-broadway.c    |  160 ++++------
 gdk/broadway/gdkdisplay-broadway.c   |  237 ++++++++++++--
 gdk/broadway/gdkdisplay-broadway.h   |   98 ++++++-
 gdk/broadway/gdkeventsource.c        |  261 ++++++++--------
 gdk/broadway/gdkprivate-broadway.h   |   14 +-
 gdk/broadway/gdkscreen-broadway.c    |   21 +-
 gdk/broadway/gdkselection-broadway.c |  142 ++++++++-
 gdk/broadway/gdkwindow-broadway.c    |   62 +++--
 gdk/broadway/gdkwindow-broadway.h    |    2 +
 gtk/gtkclipboard.c                   |   31 ++-
 18 files changed, 1258 insertions(+), 491 deletions(-)
---