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

[John Ralls <jralls src gnome org>]

commit 15c5fcf3810194f1188c1d9b619c2cf9541f7ef0
Merge: b182c22 1371a86
Author: John Ralls <jralls ceridwen us>
Date:   Tue May 31 23:21:08 2011 -0700

    Merge branch 'master' into quartz-integration

 demos/gtk-demo/colorsel.c      |    7 +-
 demos/gtk-demo/list_store.c    |    2 +-
 docs/reference/gtk/Makefile.am |    1 +
 gtk/gtkaccellabel.c            |    2 +-
 gtk/gtkappchooser.c            |    3 +
 gtk/gtkapplication.c           |  128 +++++++++++++++++----
 gtk/gtkapplication.h           |    7 +-
 gtk/gtkcolorsel.c              |   12 ++-
 gtk/gtkcombobox.c              |    9 +-
 gtk/gtkcssprovider.c           |    2 +-
 gtk/gtkcustompaperunixdialog.c |   21 +++-
 gtk/gtkeditable.c              |    1 -
 gtk/gtkentry.c                 |    6 +
 gtk/gtkentrycompletion.c       |    1 +
 gtk/gtkfilechooserbutton.c     |    3 +-
 gtk/gtkicontheme.c             |   36 ++----
 gtk/gtklabel.c                 |  248 +++++++++++++++++++++-------------------
 gtk/gtknotebook.c              |    6 +-
 gtk/gtksearchenginetracker.c   |   17 +--
 gtk/gtktreemodel.c             |   49 +++++---
 gtk/gtkwidget.c                |   10 +-
 gtk/tests/Makefile.am          |    4 +
 gtk/tests/stylecontext.c       |   59 ++++------
 gtk/tests/treepath.c           |  183 +++++++++++++++++++++++++++++
 tests/testcalendar.c           |    3 +-
 tests/testframe.c              |   24 ++---
 tests/testgtk.c                |    7 +-
 27 files changed, 566 insertions(+), 285 deletions(-)
---