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

[John Ralls <jralls src gnome org>]

commit 36ce4f0a9635a555dba5c9f7d141ac24729ff064
Merge: cce9239 f54ad24
Author: John Ralls <jralls ceridwen us>
Date:   Thu Jan 6 23:22:07 2011 -0800

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

 NEWS                                             |   23 ++++++++
 configure.in                                     |    2 +-
 docs/reference/gtk/running.sgml                  |   13 +++++
 gtk/gtk.symbols                                  |   10 +++-
 gtk/gtkcombobox.c                                |    7 ++-
 gtk/gtkcomboboxtext.c                            |    8 +++-
 gtk/gtkmain.c                                    |   47 +++++++++--------
 gtk/gtkprintbackend.h                            |    8 ++--
 gtk/gtkprinter.c                                 |   22 +++++++-
 gtk/gtkshow.c                                    |    6 ++-
 gtk/gtkwindow.c                                  |    7 +++
 gtk/gtkwindow.h                                  |    3 +-
 modules/printbackends/cups/gtkprintbackendcups.c |   28 ++++++----
 modules/printbackends/cups/gtkprintercups.c      |   10 +++-
 modules/printbackends/file/gtkprintbackendfile.c |   64 ++++++++++++++++++++--
 15 files changed, 203 insertions(+), 55 deletions(-)
---