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



commit 345a9913dbcb84b1dcc9557147690b4ca45063ef
Merge: 3ad22bc 94fc15a
Author: John Ralls <jralls ceridwen us>
Date:   Sat Sep 24 11:23:47 2011 -0700

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

 configure.in                        |    2 +-
 docs/reference/gtk/gtk-sections.txt |    2 +-
 gdk/quartz/gdkevents-quartz.c       |   10 ++--
 gdk/quartz/gdkgc-quartz.c           |    2 +-
 gdk/quartz/gdkkeys-quartz.c         |   28 +++++++------
 gdk/quartz/gdkselection-quartz.c    |    4 +-
 gtk/gtkaccelgroup.c                 |   36 +++++++++++++++++
 gtk/gtkcellrendereraccel.c          |    5 ++-
 gtk/gtkcolorsel.c                   |    5 +-
 gtk/gtkcomboboxtext.c               |    4 +-
 gtk/gtkdnd-quartz.c                 |    1 +
 gtk/gtkentry.c                      |   20 +++++-----
 gtk/gtkfilechooserdefault.c         |   14 +++----
 gtk/gtkfilesystem.c                 |   13 ++++--
 gtk/gtkiconview.c                   |   46 +++++++++++-----------
 gtk/gtkimcontextsimple.c            |    2 +-
 gtk/gtkimmulticontext.c             |    2 +-
 gtk/gtklabel.c                      |   23 ++++++-----
 gtk/gtklinkbutton.c                 |    4 +-
 gtk/gtkmain.c                       |   21 ++++++++++
 gtk/gtkmountoperation.c             |    3 +-
 gtk/gtknotebook.c                   |    2 +-
 gtk/gtkprivate.h                    |   20 +++++++++
 gtk/gtkquartz.c                     |    3 +-
 gtk/gtkrc.key.mac                   |    2 +
 gtk/gtkrecentchooserdefault.c       |    4 +-
 gtk/gtkstatusicon.c                 |    8 ++--
 gtk/gtkstock.c                      |   23 ++++++-----
 gtk/gtktextview.c                   |   16 ++++----
 gtk/gtktoolbar.c                    |   32 +++++++++++----
 gtk/gtktreeprivate.h                |    8 ++--
 gtk/gtktreeview.c                   |   74 +++++++++++++++++-----------------
 po/be.po                            |    4 +-
 33 files changed, 273 insertions(+), 170 deletions(-)
---



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