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

[John Ralls <jralls src gnome org>]

commit 250e6dd96142be6375592093c3b0d647dd966376
Merge: 486b474 e3ce60c
Author: John Ralls <jralls ceridwen us>
Date:   Fri Apr 15 23:21:25 2011 -0700

    Merge branch 'master' into quartz-integration

 gdk/broadway/broadway.js                     |   12 +-
 gdk/broadway/client.html                     |    5 +
 gdk/broadway/gdkdevice-broadway.c            |   35 +++
 gdk/broadway/gdkeventsource.c                |   15 ++
 gdk/broadway/gdkprivate-broadway.h           |    8 +-
 gdk/broadway/gdkwindow-broadway.c            |  315 +++++++++++++++++++++++++-
 gtk/gtkfilechooserdefault.c                  |   69 +++++--
 gtk/gtkmenuitem.c                            |   18 ++
 gtk/gtkrecentchoosermenu.c                   |   41 +++-
 gtk/org.gtk.Settings.FileChooser.gschema.xml |    3 +
 10 files changed, 486 insertions(+), 35 deletions(-)
---