[gtk+/gtk-2-24-quartz: 11/11] Merge branch 'gtk-2-24' into gtk-2-24-quartz
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-24-quartz: 11/11] Merge branch 'gtk-2-24' into gtk-2-24-quartz
- Date: Thu, 16 Jun 2011 06:30:53 +0000 (UTC)
commit 25d7f39ab5b5e3b4e3b150da014b90fd99da4292
Merge: 572b37e d0aa7ff
Author: John Ralls <jralls ceridwen us>
Date: Wed Jun 15 23:22:21 2011 -0700
Merge branch 'gtk-2-24' into gtk-2-24-quartz
NEWS | 26 +++++++++++++++++++++
build/win32/vs9/gdk-win32.vcproj | 4 +-
build/win32/vs9/gdk.vcprojin | 4 +-
build/win32/vs9/gtk-demo.vcproj | 4 +-
build/win32/vs9/gtk.vcprojin | 4 +-
configure.in | 4 +-
docs/reference/gtk/Makefile.am | 2 +-
docs/reference/gtk/question_index.sgml | 4 +-
gdk/directfb/gdkdisplay-directfb.c | 2 +-
gdk/gdk.c | 4 +-
gdk/gdk.h | 4 +-
gdk/gdkdisplay.h | 4 +-
gdk/gdkinput.h | 2 +-
gdk/quartz/gdkdisplay-quartz.c | 2 +-
gdk/quartz/gdkinput.c | 2 +-
gdk/win32/gdkdisplay-win32.c | 5 +++-
gdk/win32/gdkinput.c | 2 +-
gdk/x11/gdkdisplay-x11.c | 4 +-
gdk/x11/gdkfont-x11.c | 2 +-
gdk/x11/gdkproperty-x11.c | 6 ++--
gdk/x11/gdkx.h | 8 +++---
gtk/gtkaboutdialog.c | 26 ++++++++++----------
gtk/gtkaboutdialog.h | 26 ++++++++++----------
gtk/gtkaction.c | 16 ++++++------
gtk/gtkaction.h | 14 +++++-----
gtk/gtkactiongroup.c | 4 +-
gtk/gtkactiongroup.h | 4 +-
gtk/gtkassistant.c | 2 +-
gtk/gtkassistant.h | 2 +-
gtk/gtkbutton.c | 2 +-
gtk/gtkbutton.h | 2 +-
gtk/gtkcolorbutton.c | 2 +-
gtk/gtkcolorbutton.h | 2 +-
gtk/gtkcombobox.c | 2 +-
gtk/gtkcombobox.h | 2 +-
gtk/gtkentry.c | 4 +-
gtk/gtkentry.h | 4 +-
gtk/gtkentrybuffer.c | 2 +-
gtk/gtkentrybuffer.h | 2 +-
gtk/gtkexpander.c | 2 +-
gtk/gtkexpander.h | 2 +-
gtk/gtkfilechooserbutton.c | 2 +-
gtk/gtkfilechooserbutton.h | 2 +-
gtk/gtkfilefilter.c | 2 +-
gtk/gtkfilefilter.h | 2 +-
gtk/gtkfilesel.c | 4 +-
gtk/gtkfilesel.h | 2 +-
gtk/gtkfontbutton.c | 4 +-
gtk/gtkfontbutton.h | 4 +-
gtk/gtkfontsel.c | 4 +-
gtk/gtkfontsel.h | 2 +-
gtk/gtkframe.c | 2 +-
gtk/gtkframe.h | 2 +-
gtk/gtkiconfactory.c | 8 +++---
gtk/gtkiconfactory.h | 6 ++--
gtk/gtkicontheme.c | 6 ++--
gtk/gtkicontheme.h | 4 +-
gtk/gtkimage.c | 2 +-
gtk/gtkimage.h | 2 +-
gtk/gtkimagemenuitem.c | 4 +-
gtk/gtkitemfactory.c | 2 +-
gtk/gtkitemfactory.h | 2 +-
gtk/gtklabel.c | 6 ++--
gtk/gtklabel.h | 6 ++--
gtk/gtklinkbutton.c | 2 +-
gtk/gtklinkbutton.h | 2 +-
gtk/gtkmenu.c | 2 +-
gtk/gtkmenu.h | 2 +-
gtk/gtkmenuitem.c | 8 +++---
gtk/gtkmenuitem.h | 6 ++--
gtk/gtknotebook.c | 4 +-
gtk/gtknotebook.h | 8 +++---
gtk/gtkpapersize.c | 8 +++---
gtk/gtkpapersize.h | 8 +++---
gtk/gtkprinter.c | 10 ++++----
gtk/gtkprinter.h | 10 ++++----
gtk/gtkprintjob.c | 2 +-
gtk/gtkprintjob.h | 2 +-
gtk/gtkprintoperation.c | 2 +-
gtk/gtkprintoperation.h | 2 +-
gtk/gtkprintsettings.c | 12 +++++-----
gtk/gtkprintsettings.h | 14 +++++-----
gtk/gtkprogressbar.c | 2 +-
gtk/gtkprogressbar.h | 2 +-
gtk/gtkrecentfilter.c | 2 +-
gtk/gtkrecentfilter.h | 2 +-
gtk/gtkrecentmanager.c | 8 +++---
gtk/gtkrecentmanager.h | 8 +++---
gtk/gtksearchenginebeagle.c | 2 +-
gtk/gtkstatusicon.c | 6 ++--
gtk/gtkstatusicon.h | 6 ++--
gtk/gtktextmark.h | 2 +-
gtk/gtktoolbutton.c | 6 ++--
gtk/gtktoolbutton.h | 6 ++--
gtk/gtktoolitemgroup.c | 2 +-
gtk/gtktoolitemgroup.h | 2 +-
gtk/gtktoolpalette.c | 4 +-
gtk/gtktoolpalette.h | 4 +-
gtk/gtktreeviewcolumn.c | 2 +-
gtk/gtktreeviewcolumn.h | 2 +-
gtk/gtkwidget.c | 2 +-
gtk/gtkwidget.h | 2 +-
gtk/gtkwindow.c | 4 +-
gtk/gtkwindow.h | 12 +++++-----
modules/other/gail/gailarrow.c | 4 +-
modules/other/gail/gailbutton.c | 26 ++++++++++----------
modules/other/gail/gailcell.c | 12 +++++-----
modules/other/gail/gailclist.c | 8 +++---
modules/other/gail/gailclistcell.c | 4 +-
modules/other/gail/gailcombo.c | 8 +++---
modules/other/gail/gailcombobox.c | 18 +++++++-------
modules/other/gail/gailentry.c | 16 ++++++------
modules/other/gail/gailexpander.c | 26 ++++++++++----------
modules/other/gail/gailframe.c | 6 ++--
modules/other/gail/gailimage.c | 8 +++---
modules/other/gail/gailimagecell.c | 4 +-
modules/other/gail/gailitem.c | 6 ++--
modules/other/gail/gaillabel.c | 6 ++--
modules/other/gail/gailmenuitem.c | 12 +++++-----
modules/other/gail/gailnotebookpage.c | 4 +-
modules/other/gail/gailoptionmenu.c | 12 +++++-----
modules/other/gail/gailpixmap.c | 4 +-
modules/other/gail/gailrange.c | 16 ++++++------
modules/other/gail/gailscalebutton.c | 12 +++++-----
modules/other/gail/gailstatusbar.c | 6 ++--
modules/other/gail/gailtextcell.c | 4 +-
modules/other/gail/gailtextview.c | 4 +-
modules/other/gail/gailtreeview.c | 10 +++-----
modules/other/gail/gailutil.c | 8 +++---
modules/other/gail/gailwidget.c | 4 +-
modules/other/gail/gailwindow.c | 6 ++--
modules/other/gail/tests/ferret.c | 36 ++++++++++++++--------------
modules/other/gail/tests/testaction.c | 10 ++++----
modules/other/gail/tests/testbutton.c | 6 ++--
modules/other/gail/tests/testcombo.c | 2 +-
modules/other/gail/tests/testimage.c | 6 ++--
modules/other/gail/tests/testlib.c | 8 +++---
modules/other/gail/tests/testmenuitem.c | 8 +++---
modules/other/gail/tests/testnotebook.c | 6 ++--
modules/other/gail/tests/testobject.c | 8 +++---
modules/other/gail/tests/testoptionmenu.c | 4 +-
modules/other/gail/tests/testpaned.c | 4 +-
modules/other/gail/tests/testprops.c | 4 +-
modules/other/gail/tests/testselection.c | 4 +-
modules/other/gail/tests/teststatusbar.c | 6 ++--
modules/other/gail/tests/testtable.c | 8 +++---
modules/other/gail/tests/testtext.c | 2 +-
modules/other/gail/tests/testtreetable.c | 4 +-
modules/other/gail/tests/testvalues.c | 2 +-
149 files changed, 451 insertions(+), 424 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
