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

[John Ralls <jralls src gnome org>]

commit 015e1b9b5681ec7d9282558b03f08693a26a141d
Merge: 92d306f b42b47e
Author: John Ralls <jralls ceridwen us>
Date:   Sun Jan 23 23:21:12 2011 -0800

    Merge branch 'master' into quartz-integration

 build/win32/vs9/README.txt            |   11 +-
 build/win32/vs9/gdk.vcprojin          |    2 +-
 build/win32/vs9/gtk+.vsprops          |    3 +-
 docs/reference/gtk/migrating-2to3.xml |   35 +-
 gdk/gdkdevice.c                       |   22 +-
 gdk/gdkdisplay.c                      |   11 +-
 gdk/gdkevents.c                       |    3 +-
 gdk/gdkoffscreenwindow.c              |   52 +-
 gdk/gdkwindow.c                       |   47 +-
 gdk/x11/gdkcursor-x11.c               |   22 +-
 gdk/x11/gdkdevice-xi.c                |    4 -
 gdk/x11/gdkdevice-xi2.c               |   16 +-
 gdk/x11/gdkdevicemanager-core-x11.c   |    2 -
 gdk/x11/gdkdevicemanager-xi2.c        |   13 +-
 gdk/x11/gdkgeometry-x11.c             |    2 -
 gtk/Makefile.am                       |    3 +-
 gtk/gtkassistant.c                    |  714 ++++++------
 gtk/gtkbbox.c                         |    2 -
 gtk/gtkbutton.c                       |    7 +-
 gtk/gtkcalendar.c                     | 1331 +++++++++++-----------
 gtk/gtkcellarea.c                     |    5 +-
 gtk/gtkcellareaboxcontext.c           |    2 -
 gtk/gtkcellrenderer.c                 |    8 +-
 gtk/gtkcellrendererspinner.c          |    4 +-
 gtk/gtkcellrenderertext.c             |   32 +-
 gtk/gtkcheckmenuitem.c                |    3 -
 gtk/gtkcolorsel.c                     | 1447 ++++++++++++------------
 gtk/gtkcontainer.c                    | 1022 +++++++++---------
 gtk/gtkcssprovider.c                  |   10 +-
 gtk/gtkcustompaperunixdialog.c        |    2 -
 gtk/gtkentry.c                        |   14 +-
 gtk/gtkfilechooserbutton.c            |  130 ++--
 gtk/gtkfilechooserdefault.c           |  140 +--
 gtk/gtkfilechooserentry.c             |  113 +-
 gtk/gtkfontsel.c                      |   20 +-
 gtk/gtkhandlebox.c                    |   52 +-
 gtk/gtkhsv.c                          |    4 +-
 gtk/gtkiconfactory.c                  |   83 +-
 gtk/gtkiconview.c                     |  135 +--
 gtk/gtkinfobar.c                      |   12 +-
 gtk/gtklabel.c                        |   42 +-
 gtk/gtkliststore.c                    |    6 +-
 gtk/gtkmenu.c                         |   19 +-
 gtk/gtkmenuitem.c                     |    2 -
 gtk/gtkmountoperation-x11.c           |    3 -
 gtk/gtknotebook.c                     |   64 +-
 gtk/gtkoffscreenwindow.c              |    3 -
 gtk/gtkpagesetupunixdialog.c          |    2 -
 gtk/gtkpapersize.c                    |   18 +-
 gtk/gtkpathbar.c                      |   34 +-
 gtk/gtkprintcontext.c                 |    8 +-
 gtk/gtkradiobutton.c                  |    8 +-
 gtk/gtkrange.c                        |   80 +-
 gtk/gtkrecentmanager.c                |   45 +-
 gtk/gtkscale.c                        |   11 +-
 gtk/gtkscalebutton.c                  |   39 +-
 gtk/gtkscrolledwindow.c               |    6 +-
 gtk/gtkseparator.c                    |    8 +-
 gtk/gtkspinner.c                      |    2 -
 gtk/gtkstatusbar.c                    |   18 +-
 gtk/gtkstyle.c                        |  134 +--
 gtk/gtkstyle.h                        |    3 -
 gtk/gtkstylecontext.c                 |    9 +-
 gtk/gtkstylecontext.h                 |  207 ++--
 gtk/gtkstylecontextprivate.h          |   40 +
 gtk/gtktearoffmenuitem.c              |   84 +-
 gtk/gtktextdisplay.c                  |    2 +
 gtk/gtkthemingengine.c                |   59 +-
 gtk/gtktimeline.c                     |    2 -
 gtk/gtktogglebutton.c                 |    5 +
 gtk/gtktoolbar.c                      |  359 +++---
 gtk/gtktoolitemgroup.c                |   23 +-
 gtk/gtktooltip.c                      |   21 +-
 gtk/gtktreemodelfilter.c              |    8 +-
 gtk/gtktreeview.c                     |   19 +-
 gtk/gtkwidget.c                       |  348 +++---
 gtk/gtkwidgetpath.c                   |    1 +
 gtk/gtkwidgetprivate.h                |   23 +-
 gtk/gtkwindow.c                       |   57 +-
 gtk/queryimmodules.c                  |    6 -
 gtk/updateiconcache.c                 |  166 ++--
 po-properties/es.po                   |  771 +++++++-------
 po/eo.po                              | 1999 +++++++++++++++++----------------
 po/nb.po                              |  209 ++--
 po/zh_CN.po                           | 1990 +++++++++++++++++---------------
 85 files changed, 6293 insertions(+), 6210 deletions(-)
---