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

[John Ralls <jralls src gnome org>]

commit 545880ddb3863d3e61c835e1019ed6e248d084d0
Merge: e35480d 461d71f
Author: John Ralls <jralls ceridwen us>
Date:   Wed Jan 26 23:22:08 2011 -0800

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

 gdk/gdkcursor.c              |    2 +-
 gdk/gdkwindow.c              |   14 ++++++++------
 gdk/x11/gdkdisplay-x11.c     |    3 ++-
 gdk/x11/gdkvisual-x11.c      |    4 ++--
 gtk/gtkaboutdialog.c         |    6 +++---
 gtk/gtkaccelgroup.c          |    7 ++++---
 gtk/gtkaction.c              |   14 ++++++++------
 gtk/gtkbindings.c            |    2 +-
 gtk/gtkcellrenderer.c        |    2 +-
 gtk/gtkclipboard.c           |   12 +++++++-----
 gtk/gtkcontainer.c           |   16 +++++++++-------
 gtk/gtkdialog.c              |    2 +-
 gtk/gtkdnd.c                 |   10 +++++-----
 gtk/gtkfilechooser.c         |   17 +++++++++--------
 gtk/gtkiconfactory.c         |    4 ++--
 gtk/gtkicontheme.c           |    8 ++++----
 gtk/gtklabel.c               |    3 ++-
 gtk/gtkmain.c                |    6 ++++--
 gtk/gtkmenu.c                |   28 ++++++++++++++++++++++++++++
 gtk/gtknotebook.c            |    3 ++-
 gtk/gtkpagesetupunixdialog.c |    4 ++--
 gtk/gtkprintcontext.c        |    2 +-
 gtk/gtkprinter.c             |    2 +-
 gtk/gtkprintjob.c            |    6 +++---
 gtk/gtkprintoperation-unix.c |    2 +-
 gtk/gtkprintoperation.c      |    4 ++--
 gtk/gtkprintunixdialog.c     |    4 ++--
 gtk/gtkprogressbar.c         |    7 +++++++
 gtk/gtkradiobutton.c         |    8 ++++----
 gtk/gtkradiomenuitem.c       |    6 +++---
 gtk/gtkradiotoolbutton.c     |    4 ++--
 gtk/gtkrc.c                  |    2 +-
 gtk/gtkselection.c           |   17 +++++++++--------
 gtk/gtkstyle.c               |    2 +-
 gtk/gtktestutils.c           |    8 ++++----
 gtk/gtktextbuffer.c          |    4 ++--
 gtk/gtktextbufferrichtext.c  |   16 ++++++++--------
 gtk/gtktreeview.c            |    8 ++++----
 gtk/gtkwidget.c              |    9 +++++----
 gtk/gtkwindow.c              |    4 ++--
 40 files changed, 167 insertions(+), 115 deletions(-)
---