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

[John Ralls <jralls src gnome org>]

commit 9d263aef17c09dc6c608a906bf5d31b87e33c1cc
Merge: 5097fb3 9e89bf3
Author: John Ralls <jralls ceridwen us>
Date:   Wed Aug 10 23:21:25 2011 -0700

    Merge branch 'master' into quartz-integration

 autogen.sh                           |    2 +
 docs/reference/gtk/gtk3-sections.txt |    3 +
 gdk/x11/gdksettings.c                |    6 +-
 gtk/a11y/gtkentryaccessible.c        |    2 +-
 gtk/a11y/gtklabelaccessible.c        |    2 +-
 gtk/gtk.symbols                      |    2 +
 gtk/gtkbutton.c                      |   13 +-
 gtk/gtkcalendar.c                    |    4 +-
 gtk/gtkcellarea.c                    |    3 +
 gtk/gtkcheckbutton.c                 |   25 +-
 gtk/gtkcolorsel.c                    |    2 +-
 gtk/gtkentry.c                       |    2 +-
 gtk/gtkexpander.c                    |    4 +-
 gtk/gtkhsv.c                         |   27 +-
 gtk/gtkiconview.c                    |   10 +-
 gtk/gtklabel.c                       |    3 +-
 gtk/gtkmain.c                        |   12 +-
 gtk/gtknotebook.c                    |    2 +-
 gtk/gtkrange.c                       |    2 +-
 gtk/gtksettings.c                    |   19 +
 gtk/gtkswitch.c                      |    2 +-
 gtk/gtktexttag.c                     |    8 +-
 gtk/gtktextview.c                    |    2 +-
 gtk/gtktrayicon-x11.c                |    2 +-
 gtk/gtktreeview.c                    |    6 +-
 gtk/gtkwidget.c                      |   42 ++
 gtk/gtkwidget.h                      |    1 +
 gtk/gtkwindow.c                      |  111 +++++-
 gtk/gtkwindow.h                      |    3 +
 m4/introspection.m4                  |   94 -----
 po-properties/es.po                  |  731 +++++++++++++++++-----------------
 31 files changed, 625 insertions(+), 522 deletions(-)
---