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

[John Ralls <jralls src gnome org>]

commit 19b41e8c03805dcd8fa71e8352c23b9cf5f57721
Merge: 015e1b9 7db4bee
Author: John Ralls <jralls ceridwen us>
Date:   Mon Jan 24 23:21:24 2011 -0800

    Merge branch 'master' into quartz-integration

 docs/reference/gtk/gtk3-sections.txt |    2 +
 gdk/gdkdevice.c                      |    4 ++-
 gtk/gtk.symbols                      |    2 +
 gtk/gtkappchooserbutton.c            |   62 ++++++++++++++++++++++++++++++++++
 gtk/gtkappchooserbutton.h            |    5 +++
 gtk/gtkappchooserdialog.c            |    3 +-
 gtk/gtkapplication.c                 |    7 ++++
 gtk/gtkcssprovider.c                 |    1 +
 gtk/gtkstyle.c                       |   20 +++++------
 gtk/gtkwindow.c                      |   11 ++++--
 tests/testappchooserbutton.c         |    1 +
 11 files changed, 100 insertions(+), 18 deletions(-)
---