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

[John Ralls <jralls src gnome org>]

commit 743658afcd456799bd3402ffedf8eecbaa0461de
Merge: 891cdc6 f941f7b
Author: John Ralls <jralls ceridwen us>
Date:   Thu Jan 20 23:21:21 2011 -0800

    Merge branch 'master' into quartz-integration

 configure.ac                           |    2 +-
 docs/reference/gtk/getting_started.xml |    2 +-
 docs/reference/gtk/gtk3-sections.txt   |    2 +
 gdk/Makefile.am                        |    2 +-
 gdk/gdk.c                              |   14 +++---
 gdk/gdkcursor.c                        |    2 +-
 gdk/gdkdevice.c                        |   31 +++++++------
 gdk/gdkdisplay.c                       |   13 +++---
 gdk/gdkdisplaymanager.c                |    4 +-
 gdk/gdkdnd.c                           |    2 +-
 gdk/gdkevents.c                        |    8 ++--
 gdk/gdkevents.h                        |   25 ++++++----
 gdk/gdkinternals.h                     |   23 +++++-----
 gdk/gdkkeys.c                          |   15 ++++---
 gdk/gdkoffscreenwindow.c               |    4 +-
 gdk/gdkpango.c                         |    8 ++-
 gdk/gdkrectangle.c                     |    2 +-
 gdk/gdkrgba.c                          |    6 +-
 gdk/gdkselection.c                     |    9 ++--
 gdk/gdkvisual.c                        |    8 ++-
 gdk/gdkwindow.c                        |   71 ++++++++++++++++-------------
 gdk/win32/gdkprivate-win32.h           |    2 -
 gdk/x11/gdkcursor-x11.c                |    4 +-
 gdk/x11/gdkdevicemanager-xi2.c         |   48 ++++----------------
 gdk/x11/gdkdisplay-x11.c               |    5 +-
 gdk/x11/gdkmain-x11.c                  |    4 +-
 gdk/x11/gdkproperty-x11.c              |   12 +++---
 gdk/x11/gdkscreen-x11.c                |    2 +-
 gdk/x11/gdkselection-x11.c             |   15 +++---
 gdk/x11/gdkvisual-x11.c                |    6 +-
 gdk/x11/gdkwindow-x11.c                |    2 +-
 gtk/Makefile.am                        |    3 +-
 gtk/gtk.symbols                        |    2 +
 gtk/gtkaboutdialog.c                   |   24 +++++-----
 gtk/gtkaccelgroup.c                    |   10 +++--
 gtk/gtkaccelmap.c                      |    7 ++-
 gtk/gtkaction.c                        |   14 +++---
 gtk/gtkactiongroup.c                   |   24 +++++-----
 gtk/gtkalignment.c                     |   12 +++--
 gtk/gtkappchooserbutton.c              |   33 +++++++++-----
 gtk/gtkappchooserdialog.c              |   75 +++++++++++++++++++++++++++++--
 gtk/gtkappchooserdialog.h              |   19 +++++---
 gtk/gtkapplication.c                   |    2 +-
 gtk/gtkassistant.c                     |   10 ++++-
 gtk/gtkbindings.c                      |   11 +++--
 gtk/gtkbox.c                           |   12 +++--
 gtk/gtkbuildable.c                     |    6 +-
 gtk/gtkbuilder.c                       |    4 +-
 gtk/gtkbutton.c                        |    4 +-
 gtk/gtkcalendar.c                      |    9 +++-
 gtk/gtkcellarea.c                      |   24 ++++++-----
 gtk/gtkcellareacontext.c               |    2 +-
 gtk/gtkcellrenderer.c                  |   42 +++++++++---------
 gtk/gtkcellview.c                      |    5 ++-
 gtk/gtkclipboard.c                     |   38 ++++++++--------
 gtk/gtkcolorsel.c                      |   11 +++--
 gtk/gtkcombobox.c                      |   55 ++++++++++++-----------
 gtk/gtkcontainer.c                     |   20 +++++----
 gtk/gtkdialog.c                        |    5 +-
 gtk/gtkdnd.c                           |   10 ++--
 gtk/gtkeditable.c                      |    8 ++--
 gtk/gtkentry.c                         |    8 ++--
 gtk/gtkfilechooser.c                   |   17 ++++---
 gtk/gtkframe.c                         |    6 ++-
 gtk/gtkhsv.c                           |   22 +++++-----
 gtk/gtkiconfactory.c                   |    4 +-
 gtk/gtkicontheme.c                     |   47 +++++++++++---------
 gtk/gtkiconview.c                      |   36 ++++++++-------
 gtk/gtkimcontext.c                     |   24 +++++-----
 gtk/gtkimcontextsimple.c               |    2 +-
 gtk/gtklabel.c                         |   11 +++--
 gtk/gtklayout.c                        |    6 ++-
 gtk/gtkliststore.c                     |    4 +-
 gtk/gtkmain.c                          |   22 +++++----
 gtk/gtkmenu.c                          |   20 ++++----
 gtk/gtkmenushell.c                     |    4 +-
 gtk/gtkmisc.c                          |   10 +++--
 gtk/gtknotebook.c                      |    3 +-
 gtk/gtknumerableicon.c                 |    4 +-
 gtk/gtkpagesetupunixdialog.c           |    4 +-
 gtk/gtkprintcontext.c                  |   10 ++--
 gtk/gtkprinter.c                       |   10 ++--
 gtk/gtkprintjob.c                      |   13 +++--
 gtk/gtkprintoperation-unix.c           |    5 +-
 gtk/gtkprintoperation.c                |    4 +-
 gtk/gtkprintsettings.c                 |    9 ++--
 gtk/gtkprintunixdialog.c               |    4 +-
 gtk/gtkradiobutton.c                   |   19 ++++----
 gtk/gtkradiomenuitem.c                 |    9 ++--
 gtk/gtkradiotoolbutton.c               |    4 +-
 gtk/gtkrange.c                         |    8 ++-
 gtk/gtkrc.c                            |   25 ++++++-----
 gtk/gtkrecentchooser.c                 |    5 +-
 gtk/gtkrecentmanager.c                 |    2 +-
 gtk/gtkscale.c                         |    4 +-
 gtk/gtkscalebutton.c                   |    7 ++-
 gtk/gtkscrolledwindow.c                |    8 ++--
 gtk/gtkselection.c                     |   50 +++++++++++----------
 gtk/gtksettings.c                      |    5 ++
 gtk/gtkspinbutton.c                    |   10 ++--
 gtk/gtkstatusicon.c                    |   11 +++--
 gtk/gtkstock.c                         |    8 ++--
 gtk/gtkstyle.c                         |    6 +-
 gtk/gtkstylecontext.c                  |    9 ++--
 gtk/gtkstyleproperties.c               |    8 ++--
 gtk/gtkstyleprovider.c                 |    5 +-
 gtk/gtktestutils.c                     |   48 +++++++++++----------
 gtk/gtktextbuffer.c                    |    4 +-
 gtk/gtktextbufferrichtext.c            |   29 ++++++------
 gtk/gtktextiter.c                      |    2 +-
 gtk/gtktextview.c                      |    2 +-
 gtk/gtkthemingengine.c                 |   11 +++--
 gtk/gtktreednd.c                       |    7 ++-
 gtk/gtktreemodel.c                     |   10 ++--
 gtk/gtktreemodelfilter.c               |    2 +-
 gtk/gtktreestore.c                     |    5 ++-
 gtk/gtktreeview.c                      |   48 +++++++++++----------
 gtk/gtktreeviewcolumn.c                |   15 +++---
 gtk/gtkwidget.c                        |   13 +++---
 gtk/gtkwidgetpath.c                    |   12 +++---
 gtk/gtkwindow.c                        |   12 +++---
 modules/other/gail/gailwidget.c        |    8 ++--
 tests/simple.c                         |    1 -
 tests/testappchooser.c                 |    2 +
 124 files changed, 885 insertions(+), 712 deletions(-)
---