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

[John Ralls <jralls src gnome org>]

commit 402ee3b5efc450e01f2ab60a92b63cb94d16ce49
Merge: d06662a f40a129
Author: John Ralls <jralls ceridwen us>
Date:   Mon Jan 10 23:22:10 2011 -0800

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

 docs/reference/gtk/tmpl/gtkmenutoolbutton.sgml |   18 ++
 gtk/gtkaccellabel.c                            |    2 +-
 gtk/gtkaction.c                                |   10 +-
 gtk/gtkactivatable.c                           |    2 +-
 gtk/gtkassistant.c                             |   23 ++--
 gtk/gtkbuildable.c                             |    6 +-
 gtk/gtkbutton.c                                |    2 +-
 gtk/gtkcellrenderer.c                          |    8 +-
 gtk/gtkcellview.c                              |    2 +-
 gtk/gtkcolorseldialog.c                        |    2 +-
 gtk/gtkcombobox.c                              |    8 +-
 gtk/gtkcomboboxtext.c                          |  224 +++++++++++++++++++++++-
 gtk/gtkcontainer.c                             |    2 +-
 gtk/gtkdnd.c                                   |   19 +-
 gtk/gtkentry.c                                 |   16 +-
 gtk/gtkentrycompletion.c                       |    7 +-
 gtk/gtkexpander.c                              |    5 +-
 gtk/gtkfilechooser.c                           |   42 +++---
 gtk/gtkfontsel.c                               |   56 +++---
 gtk/gtkframe.c                                 |    2 +-
 gtk/gtkiconfactory.c                           |    4 +-
 gtk/gtkicontheme.c                             |   17 +-
 gtk/gtkiconview.c                              |    9 +-
 gtk/gtkimagemenuitem.c                         |    5 +-
 gtk/gtkinfobar.c                               |    6 +-
 gtk/gtkinvisible.c                             |    2 +-
 gtk/gtklabel.c                                 |    4 +-
 gtk/gtklayout.c                                |   26 ++--
 gtk/gtkmain.c                                  |   11 +-
 gtk/gtkmenuitem.c                              |    6 +-
 gtk/gtkmenutoolbutton.c                        |   36 ++++-
 gtk/gtkmountoperation.c                        |    6 +-
 gtk/gtknotebook.c                              |   25 ++--
 gtk/gtkoffscreenwindow.c                       |    5 +-
 gtk/gtkpagesetup.c                             |    6 +-
 gtk/gtkpaned.c                                 |    6 +-
 gtk/gtkplug.c                                  |    4 +-
 gtk/gtkprintcontext.c                          |   12 +-
 gtk/gtkprintoperation.c                        |   18 +-
 gtk/gtkprintsettings.c                         |   18 +-
 gtk/gtkradiobutton.c                           |    6 +-
 gtk/gtkradiomenuitem.c                         |   27 ++-
 gtk/gtkradiotoolbutton.c                       |   26 ++--
 gtk/gtkrange.c                                 |    4 +-
 gtk/gtkrc.c                                    |   36 ++--
 gtk/gtkrecentchooser.c                         |    6 +-
 gtk/gtkrecentmanager.c                         |   14 +-
 gtk/gtkscale.c                                 |   12 +-
 gtk/gtkscalebutton.c                           |    8 +-
 gtk/gtkscrolledwindow.c                        |   17 +-
 gtk/gtkselection.c                             |    4 +-
 gtk/gtksettings.c                              |   10 +-
 gtk/gtksocket.c                                |    2 +-
 gtk/gtkspinbutton.c                            |    2 +-
 gtk/gtkstatusbar.c                             |    2 +-
 gtk/gtkstatusicon.c                            |   11 +-
 gtk/gtkstyle.c                                 |   14 +-
 gtk/gtktextbuffer.c                            |   15 +-
 gtk/gtktextiter.c                              |   10 +-
 gtk/gtktexttagtable.c                          |   58 ++++++-
 gtk/gtktoolbar.c                               |    8 +-
 gtk/gtktoolbutton.c                            |   26 ++--
 gtk/gtktoolitem.c                              |   28 ++--
 gtk/gtktoolitemgroup.c                         |    6 +-
 gtk/gtktreemodel.c                             |   12 +-
 gtk/gtktreemodelsort.c                         |    6 +-
 gtk/gtktreeview.c                              |   39 ++--
 gtk/gtktreeviewcolumn.c                        |   19 +-
 gtk/gtkviewport.c                              |    8 +-
 gtk/gtkwidget.c                                |   17 +-
 gtk/gtkwindow.c                                |    4 +-
 71 files changed, 752 insertions(+), 387 deletions(-)
---