[gtk+/gtkbuilder-gbinding: 101/101] Merge branch 'master' into gtkbuilder-gbinding

[Denis Washington <denisw src gnome org>]

commit c3fe8359dda108d0f06400e7cd01801d9bc9595f
Merge: b45a20d bf89bc6
Author: Denis Washington <denisw online de>
Date:   Wed Feb 15 22:46:26 2012 +0100

    Merge branch 'master' into gtkbuilder-gbinding

 demos/gtk-demo/colorsel.c                     |   17 +-
 demos/widget-factory/widget-factory.c         |    3 +-
 docs/reference/gtk/Makefile.am                |    2 +
 docs/reference/gtk/gtk-docs.sgml              |   10 +-
 docs/reference/gtk/gtk3-sections.txt          |   60 ++-
 docs/reference/gtk/gtk3.types                 |    3 +
 docs/reference/gtk/images/colorchooser.png    |  Bin 0 -> 16019 bytes
 docs/reference/gtk/images/fontchooser.png     |  Bin 0 -> 63622 bytes
 docs/reference/gtk/visual_index.xml           |    6 +
 docs/tools/widgets.c                          |   29 +
 gtk/Makefile.am                               |   36 +-
 gtk/a11y/Makefile.am                          |    2 +
 gtk/a11y/gtkcolorswatchaccessible.c           |  104 ++++
 gtk/a11y/gtkcolorswatchaccessible.h           |   51 ++
 gtk/{ => deprecated}/gtkcolorsel.c            |    7 +-
 gtk/{ => deprecated}/gtkcolorsel.h            |   24 +-
 gtk/{ => deprecated}/gtkcolorseldialog.c      |    6 +-
 gtk/{ => deprecated}/gtkcolorseldialog.h      |    4 +-
 gtk/deprecated/gtkfontsel.c                   |    2 +-
 gtk/deprecated/gtkhbox.c                      |    2 +-
 gtk/{ => deprecated}/gtkhsv.c                 |   83 +---
 gtk/{ => deprecated}/gtkhsv.h                 |   20 +-
 gtk/deprecated/gtkvbox.c                      |    2 +-
 gtk/gtk.h                                     |   10 +-
 gtk/gtk.symbols                               |    9 +
 gtk/gtkactivatable.c                          |    4 +-
 gtk/gtkactivatable.h                          |    4 +-
 gtk/gtkappchooserbutton.c                     |    6 +-
 gtk/gtkbbox.c                                 |    4 +-
 gtk/gtkcolorbutton.c                          |  495 ++++++++--------
 gtk/gtkcolorbutton.h                          |   43 +-
 gtk/gtkcolorchooser.c                         |  258 ++++++++
 gtk/gtkcolorchooser.h                         |   82 +++
 gtk/gtkcolorchooserdialog.c                   |  303 ++++++++++
 gtk/gtkcolorchooserdialog.h                   |   68 +++
 gtk/gtkcolorchooserprivate.h                  |   34 +
 gtk/gtkcolorchooserwidget.c                   |  803 +++++++++++++++++++++++++
 gtk/gtkcolorchooserwidget.h                   |   71 +++
 gtk/gtkcoloreditor.c                          |  654 ++++++++++++++++++++
 gtk/gtkcoloreditorprivate.h                   |   70 +++
 gtk/gtkcolorplane.c                           |  449 ++++++++++++++
 gtk/gtkcolorplaneprivate.h                    |   72 +++
 gtk/gtkcolorscale.c                           |  362 +++++++++++
 gtk/gtkcolorscaleprivate.h                    |   80 +++
 gtk/gtkcolorswatch.c                          |  699 +++++++++++++++++++++
 gtk/gtkcolorswatchprivate.h                   |   97 +++
 gtk/gtkcolorutils.c                           |  260 ++++++++
 gtk/gtkcolorutils.h                           |   50 ++
 gtk/gtkcomboboxtext.c                         |    2 +-
 gtk/gtkentry.c                                |    2 +-
 gtk/gtkfontchooserdialog.c                    |    6 +-
 gtk/gtkfontchooserwidget.c                    |    2 +-
 gtk/gtkiconview.c                             |    2 +-
 gtk/gtkimcontextsimple.c                      |    1 -
 gtk/gtknotebook.c                             |   34 +-
 gtk/gtkoverlay.c                              |    6 +-
 gtk/gtkprintoperation.c                       |    6 +-
 gtk/gtkprintunixdialog.c                      |    8 +-
 gtk/gtkrange.c                                |   31 +-
 gtk/gtkroundedbox.c                           |   51 ++-
 gtk/gtkroundedboxprivate.h                    |   10 +-
 gtk/gtkstylecontext.c                         |    2 +-
 gtk/gtkthemingbackground.c                    |   66 ++-
 gtk/gtkthemingbackgroundprivate.h             |   10 +-
 gtk/gtkthemingengine.c                        |   10 +-
 gtk/gtkthemingengine.h                        |    3 -
 gtk/gtkthemingengineprivate.h                 |    3 +
 gtk/gtktoolitem.c                             |    2 +-
 gtk/org.gtk.Settings.ColorChooser.gschema.xml |   13 +
 po-properties/POTFILES.in                     |   13 +-
 po-properties/es.po                           |  159 +++--
 po/POTFILES.in                                |   13 +-
 po/es.po                                      |  335 +++++++++--
 tests/Makefile.am                             |    4 +
 tests/prop-editor.c                           |    8 +-
 tests/testcolorchooser.c                      |   98 +++
 tests/testgtk.c                               |   26 +-
 tests/testtoplevelembed.c                     |    2 +-
 78 files changed, 5758 insertions(+), 630 deletions(-)
---