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



commit 8fd1ad345f9c0c2db8f9d013cc8215d7c9913ae3
Merge: bb2cbec a71b892
Author: John Ralls <jralls ceridwen us>
Date:   Fri Jul 8 23:21:03 2011 -0700

    Merge branch 'master' into quartz-integration

 gdk/gdkoffscreenwindow.c                     |   10 +-
 gtk/Makefile.am                              |    2 +-
 gtk/a11y/Makefile.am                         |   16 +-
 gtk/a11y/gail.c                              |   21 +-
 gtk/a11y/gailmisc.c                          |  545 +------------
 gtk/a11y/gailmisc.h                          |   67 +--
 gtk/a11y/gailtextcell.c                      |  232 ++++--
 gtk/a11y/gailtextcell.h                      |    2 -
 gtk/a11y/gailtextutil.c                      |  786 ------------------
 gtk/a11y/gailtextutil.h                      |   87 --
 gtk/a11y/gailtoplevel.c                      |  368 ---------
 gtk/a11y/gailtoplevel.h                      |   52 --
 gtk/a11y/gailutil.c                          |  248 ++----
 gtk/a11y/gailutil.h                          |   24 +-
 gtk/a11y/gtktoplevelaccessible.c             |  283 +++++++
 gtk/a11y/gtktoplevelaccessible.h             |   52 ++
 gtk/a11y/gtkwindowaccessible.c               |    6 +-
 gtk/gtk.symbols                              |    8 +-
 gtk/gtkfilechooser.c                         |   93 ++-
 gtk/gtkfilechooserdefault.c                  | 1123 ++++++++++++--------------
 gtk/gtkfilechooserdialog.c                   |   58 ++-
 gtk/gtkfilechooserentry.c                    |    2 -
 gtk/gtkfilechooserprivate.h                  |   18 +-
 gtk/gtkfilechooserutils.c                    |   56 ++
 gtk/gtkfilechooserutils.h                    |    2 +
 gtk/gtkfilesystem.c                          |   17 +-
 gtk/gtkiconview.c                            |    6 +
 gtk/org.gtk.Settings.FileChooser.gschema.xml |    3 -
 tests/a11y/Makefile.am                       |    3 +
 tests/a11y/util.c                            |   52 ++
 30 files changed, 1409 insertions(+), 2833 deletions(-)
---



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]