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

[John Ralls <jralls src gnome org>]

commit 53be7d2427b905c74569754335448bda6bd8229e
Merge: e9fc274 eb5a500
Author: John Ralls <jralls ceridwen us>
Date:   Thu Nov 25 13:05:51 2010 -0800

    Merge branch 'master' into quartz-integration

 docs/reference/gtk/gtk3-sections.txt  |   55 -
 docs/reference/gtk/tmpl/gtkenums.sgml |    9 -
 gdk/Makefile.am                       |    2 +-
 gdk/abicheck.sh                       |    2 +-
 gdk/gdk.c                             |    4 +-
 gdk/gdk.symbols                       | 1329 +++++----------
 gdk/gdkdevice.c                       |   16 +-
 gdk/gdkdevice.h                       |   34 -
 gdk/gdkdevicemanager.c                |    8 +-
 gdk/gdkdisplay.c                      |   14 +-
 gdk/gdkevents.c                       |    2 +-
 gdk/gdkkeys.c                         |    2 +-
 gdk/gdkoffscreenwindow.c              |    4 +-
 gdk/gdkpango.c                        |    4 +-
 gdk/gdkselection.c                    |    6 +-
 gdk/gdkwindow.c                       |   12 +-
 gdk/makefile.msc                      |    2 +-
 gdk/win32/gdkdevice-win32.c           |    4 +-
 gdk/win32/gdkdevice-wintab.c          |    2 +-
 gdk/x11/gdkcursor-x11.c               |    4 +-
 gdk/x11/gdkdisplay-x11.c              |   14 +-
 gdk/x11/gdkdnd-x11.c                  |    4 +-
 gdk/x11/gdkkeys-x11.c                 |    3 +-
 gdk/x11/gdkscreen-x11.c               |    6 +-
 gdk/x11/gdkselection-x11.c            |    6 +-
 gdk/x11/gdkwindow-x11.c               |   14 +-
 gdk/x11/gdkxid.c                      |    8 +-
 gtk/Makefile.am                       |    8 +-
 gtk/abicheck.sh                       |    2 +-
 gtk/gtk.h                             |    3 -
 gtk/gtk.symbols                       | 3183 +++++++++++----------------------
 gtk/gtkbox.c                          |    8 +-
 gtk/gtkenums.h                        |    7 -
 gtk/gtkhruler.c                       |   51 -
 gtk/gtkhruler.h                       |   80 -
 gtk/gtkmenu.c                         |    7 +-
 gtk/gtkmenushell.c                    |   12 +
 gtk/gtkruler.c                        |  959 ----------
 gtk/gtkruler.h                        |  120 --
 gtk/gtkselection.h                    |    9 +-
 gtk/gtkvruler.c                       |   80 -
 gtk/gtkvruler.h                       |   80 -
 gtk/makefile.msc.in                   |    8 +-
 gtk/tests/builder.c                   |    2 -
 gtk/updateiconcache.c                 |    2 +
 tests/testgtk.c                       |   69 -
 46 files changed, 1569 insertions(+), 4691 deletions(-)
---