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

[John Ralls <jralls src gnome org>]

commit bb8abc4bce2b378ee41dc77ac4f1b35dccd01bf9
Merge: 55e83b7 53845f0
Author: John Ralls <jralls ceridwen us>
Date:   Sat Dec 18 11:21:08 2010 -0800

    Merge branch 'master' into quartz-integration

 docs/reference/gdk/gdk3-sections.txt        |   10 -
 docs/reference/gtk/gtk3-sections.txt        |   28 +-
 docs/reference/gtk/tmpl/gtkdrawingarea.sgml |   12 +-
 gdk/Makefile.am                             |    2 -
 gdk/gdk.h                                   |    1 -
 gdk/gdk.symbols                             |    5 -
 gdk/gdkdevice.c                             |    5 -
 gdk/gdkdeviceprivate.h                      |    2 -
 gdk/gdkdisplay.c                            |   39 -
 gdk/gdkdisplay.h                            |    4 -
 gdk/gdkinput.h                              |   60 -
 gdk/gdkinternals.h                          |    9 +-
 gdk/gdkwindow.c                             |  216 +---
 gdk/x11/Makefile.am                         |    1 -
 gdk/x11/gdkeventsource.c                    |   32 +-
 gdk/x11/gdkinput.c                          |  227 ----
 gtk/Makefile.am                             |    1 +
 gtk/gtk.symbols                             |    8 +-
 gtk/gtkaboutdialog.c                        |    3 +
 gtk/gtkaccelmap.c                           |    2 +-
 gtk/gtkbindings.c                           |  407 +------
 gtk/gtkcellarea.c                           | 1652 +++++++++++++------------
 gtk/gtkcellarea.h                           |  474 ++++----
 gtk/gtkcellareabox.c                        | 1302 ++++++++++----------
 gtk/gtkcellareabox.h                        |   34 +-
 gtk/gtkcellareaboxcontext.c                 |  320 +++---
 gtk/gtkcellareaboxcontext.h                 |   76 +-
 gtk/gtkcellareacontext.c                    |  290 +++--
 gtk/gtkcellareacontext.h                    |   86 +-
 gtk/gtkcombobox.c                           |   20 +-
 gtk/gtkcssprovider.c                        |    2 +-
 gtk/gtkdrawingarea.c                        |    1 -
 gtk/gtkdrawingarea.h                        |    2 -
 gtk/gtkenums.h                              |   11 +-
 gtk/gtkiconfactory.h                        |    4 +-
 gtk/gtkicontheme.c                          |    2 +-
 gtk/gtkmain.c                               |   38 +-
 gtk/gtkplug-x11.c                           |    1 +
 gtk/gtkplug.c                               |    2 +-
 gtk/gtkrc.c                                 | 1796 +--------------------------
 gtk/gtkrc.h                                 |   18 -
 gtk/gtkselection.c                          |   42 +-
 gtk/gtkselection.h                          |   32 +-
 gtk/gtksettings.c                           |    2 -
 gtk/gtksocket-x11.c                         |    2 +-
 gtk/gtksocket.c                             |    2 +-
 gtk/gtkstyle.c                              |  484 +-------
 gtk/gtkstyle.h                              |   10 +-
 gtk/gtkstylecontext.c                       |   24 +-
 gtk/gtkstyleprovider.c                      |    2 +-
 gtk/gtkthemingengine.c                      |    6 +-
 gtk/gtktreemodelsort.c                      |  462 ++++---
 gtk/gtktreemodelsort.h                      |   28 +-
 gtk/gtktreestore.c                          |  401 ++++---
 gtk/gtktreestore.h                          |   18 +-
 gtk/gtkvolumebutton.c                       |  105 ++-
 gtk/gtkwidget.c                             |  323 +----
 gtk/gtkwidget.h                             |    4 -
 gtk/gtkwidgetpath.c                         |   31 +-
 gtk/gtkwidgetpath.h                         |    6 +-
 gtk/gtkwindow.c                             |   86 +-
 gtk/gtkwindow.h                             |   63 +-
 gtk/gtkwindowprivate.h                      |   90 ++
 gtk/tests/stylecontext.c                    |    4 +-
 po-properties/es.po                         | 1406 +++++++++++-----------
 65 files changed, 3930 insertions(+), 6908 deletions(-)
---