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

[John Ralls <jralls src gnome org>]

commit 3374d3e9fc4e19eafb806c3734ee2568f16eb0d0
Merge: 8ef5421 4c6721d
Author: John Ralls <jralls ceridwen us>
Date:   Sat May 21 23:21:07 2011 -0700

    Merge branch 'master' into quartz-integration

 gtk/Makefile.am                                 |    4 +-
 gtk/gtkcssparser.c                              |    2 +-
 gtk/gtkcssparserprivate.h                       |    2 +-
 gtk/gtkcssprovider.c                            |  159 +++++++--
 gtk/gtkcssstringfuncsprivate.h                  |   37 --
 gtk/gtklabel.c                                  |    4 +-
 gtk/gtklockbutton.c                             |    4 +-
 gtk/gtkshadow.c                                 |    8 +-
 gtk/gtkshadowprivate.h                          |    2 -
 gtk/gtkstatusbar.c                              |    3 +-
 gtk/gtkstylecontext.c                           |   84 +++--
 gtk/gtkstyleproperties.c                        |  319 +++++-----------
 gtk/gtkstylepropertiesprivate.h                 |   16 +-
 gtk/{gtkcssstringfuncs.c => gtkstyleproperty.c} |  455 ++++++++++++++++++++---
 gtk/gtkstylepropertyprivate.h                   |   66 ++++
 gtk/gtkthemingengine.c                          |   22 +-
 tests/css/parser/Makefile.am                    |    2 +
 tests/css/parser/shorthand.css                  |    5 +
 tests/css/parser/shorthand.ref.css              |    6 +
 tests/css/parser/simple.css                     |    3 +
 tests/reftests/Makefile.am                      |   22 +-
 tests/reftests/label-shadows.css                |    8 +
 tests/reftests/label-shadows.ref.ui             |  184 +++++++++
 tests/reftests/label-shadows.ui                 |  100 +++++
 tests/reftests/shorthand-entry-border.css       |   21 +
 tests/reftests/shorthand-entry-border.ref.ui    |   15 +
 tests/reftests/shorthand-entry-border.ui        |   14 +
 27 files changed, 1139 insertions(+), 428 deletions(-)
---