[gtk+/gtk-2-24-quartz: 29/29] Merge branch 'gtk-2-24' into gtk-2-24-quartz

[John Ralls <jralls src gnome org>]

commit feb638fe5cb6eabbe378b0190bf41dfe219edfd9
Merge: df79899 6b0ab20
Author: John Ralls <jralls ceridwen us>
Date:   Tue Jul 12 23:22:03 2011 -0700

    Merge branch 'gtk-2-24' into gtk-2-24-quartz

 gtk/gtkfilechooser.c         |   76 +-
 gtk/gtkfilechooser.h         |    2 +-
 gtk/gtkfilechooserbutton.c   |  133 ++--
 gtk/gtkfilechooserdefault.c  | 1960 ++++++++++++++++++++----------------------
 gtk/gtkfilechooserdialog.c   |   23 -
 gtk/gtkfilechooserentry.c    |  128 ++--
 gtk/gtkfilechooserprivate.h  |   21 +-
 gtk/gtkfilechoosersettings.c |   48 +-
 gtk/gtkfilechoosersettings.h |   10 +-
 gtk/gtkfilechooserutils.c    |   56 ++
 gtk/gtkfilechooserutils.h    |    2 +
 gtk/gtkfilesystem.c          |   17 +-
 12 files changed, 1216 insertions(+), 1260 deletions(-)
---