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

[John Ralls <jralls src gnome org>]

commit 9a4c7eda667043a9c24e4c74e89baede46e87d7c
Merge: ba3303e 3fa5813
Author: John Ralls <jralls ceridwen us>
Date:   Sun Aug 28 23:21:31 2011 -0700

    Merge branch 'master' into quartz-integration

 configure.ac                         |    4 +-
 demos/gtk-demo/Makefile.am           |    2 +-
 demos/gtk-demo/changedisplay.c       |    3 +-
 demos/gtk-demo/pickers.c             |   15 +-
 demos/gtk-demo/sizegroup.c           |    3 +-
 demos/gtk-demo/ui_manager.c          |    3 +-
 docs/reference/gdk/gdk3-sections.txt |    9 +-
 docs/reference/gtk/gtk3-sections.txt |    1 +
 gdk/gdk.symbols                      |    5 +
 gdk/gdkevents.c                      |  186 ++
 gdk/gdkevents.h                      |   16 +-
 gtk/gtk.symbols                      |    1 +
 gtk/gtkaboutdialog.c                 |    6 +-
 gtk/gtkappchooserdialog.c            |   31 +-
 gtk/gtkappchooserwidget.c            |    2 +-
 gtk/gtkfilechooserdefault.c          |    3 +-
 gtk/gtkfontchooser.c                 |    1 -
 gtk/gtkgrid.c                        |   36 +
 gtk/gtkgrid.h                        |    3 +
 gtk/gtkscrolledwindow.h              |    4 +-
 gtk/gtktrayicon-x11.c                |   36 +-
 po-properties/de.po                  | 3671 +++++++++++++++-------------------
 tests/prop-editor.c                  |   15 +-
 tests/testappchooser.c               |   12 +-
 tests/testcalendar.c                 |    9 +-
 tests/testgrid.c                     |   35 +-
 tests/testgtk.c                      |   54 +-
 27 files changed, 2054 insertions(+), 2112 deletions(-)
---