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

[John Ralls <jralls src gnome org>]

commit 9e5ec9ec377ceea5fa3982f433b498976b65fd2d
Merge: 92a1263 cfaed62
Author: John Ralls <jralls ceridwen us>
Date:   Tue Feb 1 13:55:26 2011 -0800

    Merge branch 'master' into quartz-integration
    
    Conflicts:
    	gdk/quartz/gdkselection-quartz.c

 NEWS                                 |  140 +++++++++++++++++++++++++++++++++-
 configure.ac                         |    1 -
 docs/reference/gdk/gdk3-sections.txt |    3 +-
 gdk/gdk.symbols                      |    2 +-
 gdk/gdkconfig.h.win32                |    2 -
 gdk/gdkdisplay.c                     |   22 -----
 gdk/gdkdisplayprivate.h              |    6 +-
 gdk/gdkdnd.h                         |    8 +--
 gdk/gdkevents.c                      |   15 ++++
 gdk/gdkevents.h                      |    4 +-
 gdk/gdkselection.c                   |    6 +-
 gdk/gdkselection.h                   |    6 +-
 gdk/gdktypes.h                       |   18 -----
 gdk/gdkwindow.c                      |   22 +++++
 gdk/gdkwindow.h                      |    4 +
 gdk/gdkwindowimpl.h                  |    2 +
 gdk/quartz/gdkdisplay-quartz.c       |    4 -
 gdk/quartz/gdkdnd-quartz.c           |   10 ---
 gdk/quartz/gdkevents-quartz.c        |   19 -----
 gdk/quartz/gdkprivate-quartz.h       |   20 -----
 gdk/quartz/gdkselection-quartz.c     |   12 ---
 gdk/x11/gdkdevicemanager-xi2.c       |   30 +++++++-
 gdk/x11/gdkdisplay-x11.c             |   14 +--
 gdk/x11/gdkdnd-x11.c                 |   50 ++++--------
 gdk/x11/gdkprivate-x11.h             |    8 ++-
 gdk/x11/gdkselection-x11.c           |    6 +-
 gdk/x11/gdkwindow-x11.c              |   31 +++++++-
 gtk/gtk.symbols                      |    1 -
 gtk/gtkfixed.c                       |    2 -
 gtk/gtkselection.c                   |   10 +--
 gtk/gtksocket.c                      |    8 +-
 31 files changed, 287 insertions(+), 199 deletions(-)
---