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

[John Ralls <jralls src gnome org>]

commit c79fbc8fd2e82b45e46125aed8467dab5ab5f446
Merge: a18039d 645650a
Author: John Ralls <jralls ceridwen us>
Date:   Sat Jan 29 23:21:13 2011 -0800

    Merge branch 'master' into quartz-integration

 docs/reference/gtk/getting_started.xml           |    4 +-
 docs/reference/gtk/gtk3.types                    |    2 +-
 docs/reference/gtk/migrating-2to3.xml            |    8 ++-
 docs/reference/gtk/migrating-GtkStyleContext.xml |   11 +++-
 docs/reference/gtk/tmpl/gtkrc.sgml               |    2 +-
 docs/reference/gtk/x11.sgml                      |    7 ++
 gdk/x11/gdkasync.c                               |    6 +-
 gdk/x11/gdkdevice-xi2.c                          |    9 ++-
 gtk/Makefile.am                                  |    5 +-
 gtk/gtk.h                                        |    2 -
 gtk/gtkdrawingarea.c                             |    6 +-
 gtk/gtkfilefilter.c                              |    4 +-
 gtk/gtkplug.c                                    |   31 ++++++-----
 gtk/gtkplug.h                                    |   41 ++++++--------
 gtk/gtksocket.c                                  |   67 +++++++++++-----------
 gtk/gtksocket.h                                  |   21 +++----
 gtk/gtkstyle.c                                   |    3 +-
 gtk/gtktestutils.c                               |    2 +-
 gtk/gtkwidget.c                                  |   44 +++++++--------
 gtk/gtkx.h                                       |   29 +++++++++
 gtk/tests/builder.c                              |    4 +-
 gtk/tests/filtermodel.c                          |   14 ++--
 gtk/tests/treeview-scrolling.c                   |    3 -
 modules/other/gail/gail.c                        |    2 +-
 modules/other/gail/gailentry.c                   |    9 ++-
 modules/other/gail/gailexpander.c                |    2 -
 modules/other/gail/gailrenderercell.c            |    3 -
 modules/other/gail/gailtextview.c                |    2 -
 modules/other/gail/gailtoplevel.c                |    4 +-
 modules/other/gail/gailtreeview.c                |   19 +-----
 modules/other/gail/gailwindow.c                  |    2 +-
 modules/other/gail/tests/ferret.c                |    6 +-
 modules/other/gail/tests/testcombo.c             |    3 -
 modules/other/gail/tests/testlib.c               |    3 -
 modules/other/gail/tests/testpaned.c             |    3 -
 modules/printbackends/cups/gtkprintbackendcups.c |    3 -
 tests/testsocket.c                               |    1 +
 tests/testsocket_common.c                        |    2 +-
 38 files changed, 195 insertions(+), 194 deletions(-)
---