[gtk+/quartz-integration: 28/28] Merge branch 'master' into quartz-integration
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration: 28/28] Merge branch 'master' into quartz-integration
- Date: Sat, 11 Jun 2011 06:30:55 +0000 (UTC)
commit fa97e12394729b15be9c6beeb599d431d74fa3b5
Merge: c5b647e abca0f0
Author: John Ralls <jralls ceridwen us>
Date: Fri Jun 10 23:21:12 2011 -0700
Merge branch 'master' into quartz-integration
configure.ac | 57 +-
docs/CODING-STYLE | 8 +-
docs/reference/gtk/question_index.sgml | 4 +-
gdk/broadway/gdkdisplay-broadway.c | 2 +-
gdk/broadway/gdkproperty-broadway.c | 2 +-
gdk/gdk.c | 4 +-
gdk/gdkdevice.h | 2 +-
gdk/gdkdisplay.c | 2 +-
gdk/gdkdisplay.h | 2 +-
gdk/gdkdisplayprivate.h | 2 +-
gdk/gdkmain.h | 4 +-
gdk/wayland/gdkdisplay-wayland.c | 2 +-
gdk/win32/gdkdisplay-win32.c | 2 +-
gdk/x11/gdkdisplay-x11.c | 4 +-
gdk/x11/gdkproperty-x11.c | 4 +-
gdk/x11/gdkx11display.h | 2 +-
gdk/x11/gdkx11property.h | 4 +-
gtk/compose-parse.py | 10 +-
gtk/gtkaboutdialog.c | 24 +-
gtk/gtkaboutdialog.h | 24 +-
gtk/gtkaction.c | 14 +-
gtk/gtkaction.h | 14 +-
gtk/gtkactiongroup.c | 4 +-
gtk/gtkactiongroup.h | 4 +-
gtk/gtkassistant.c | 8 +-
gtk/gtkassistant.h | 2 +-
gtk/gtkbbox.c | 9 +-
gtk/gtkbox.c | 58 +-
gtk/gtkbutton.c | 2 +-
gtk/gtkbutton.h | 2 +-
gtk/gtkcellarea.c | 2 +-
gtk/gtkcellarea.h | 4 +-
gtk/gtkcellrendereraccel.c | 3 +-
gtk/gtkcolorbutton.c | 2 +-
gtk/gtkcolorbutton.h | 2 +-
gtk/gtkcombobox.c | 2 +-
gtk/gtkcombobox.h | 4 +-
gtk/gtkentry.c | 6 +-
gtk/gtkentry.h | 14 +-
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/gtkfilechooserdefault.c | 6 +-
gtk/gtkfilefilter.c | 2 +-
gtk/gtkfilefilter.h | 2 +-
gtk/gtkfontbutton.c | 4 +-
gtk/gtkfontbutton.h | 4 +-
gtk/gtkfontsel.c | 16 +-
gtk/gtkfontsel.h | 2 +-
gtk/gtkframe.c | 2 +-
gtk/gtkframe.h | 6 +-
gtk/gtkhbox.c | 14 +-
gtk/gtkiconfactory.c | 6 +-
gtk/gtkiconfactory.h | 8 +-
gtk/gtkicontheme.c | 4 +-
gtk/gtkicontheme.h | 4 +-
gtk/gtkimage.c | 6 +-
gtk/gtkimage.h | 6 +-
gtk/gtkimagemenuitem.c | 4 +-
gtk/gtkimcontextsimpleseqs.h | 8826 ++++++++++++++-------------
gtk/gtklabel.c | 6 +-
gtk/gtklabel.h | 6 +-
gtk/gtklinkbutton.c | 2 +-
gtk/gtklinkbutton.h | 2 +-
gtk/gtkmenu.c | 2 +-
gtk/gtkmenu.h | 6 +-
gtk/gtkmenuitem.c | 11 +-
gtk/gtkmenuitem.h | 10 +-
gtk/gtkmessagedialog.c | 16 +-
gtk/gtkmountoperation.c | 13 +-
gtk/gtknotebook.c | 4 +-
gtk/gtknotebook.h | 18 +-
gtk/gtkpagesetupunixdialog.c | 12 +-
gtk/gtkpaned.c | 10 +-
gtk/gtkpapersize.c | 8 +-
gtk/gtkpapersize.h | 8 +-
gtk/gtkprintbackend.c | 6 +-
gtk/gtkprinter.c | 10 +-
gtk/gtkprinter.h | 10 +-
gtk/gtkprinteroptionwidget.c | 6 +-
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/gtkprintunixdialog.c | 51 +-
gtk/gtkprogressbar.c | 2 +-
gtk/gtkprogressbar.h | 6 +-
gtk/gtkradiomenuitem.c | 6 +-
gtk/gtkrecentfilter.c | 2 +-
gtk/gtkrecentfilter.h | 2 +-
gtk/gtkrecentmanager.c | 8 +-
gtk/gtkrecentmanager.h | 8 +-
gtk/gtkscale.c | 4 +-
gtk/gtkscrollbar.c | 10 +-
gtk/gtksearchenginebeagle.c | 2 +-
gtk/gtkseparator.c | 9 +-
gtk/gtkstatusicon.c | 6 +-
gtk/gtkstatusicon.h | 6 +-
gtk/gtkstylecontext.c | 2 +-
gtk/gtkstylecontext.h | 2 +-
gtk/gtktextmark.h | 2 +-
gtk/gtkthemingengine.c | 2 +-
gtk/gtkthemingengine.h | 2 +-
gtk/gtktoolbutton.c | 6 +-
gtk/gtktoolbutton.h | 6 +-
gtk/gtktoolitemgroup.c | 5 +-
gtk/gtktoolitemgroup.h | 2 +-
gtk/gtktoolpalette.c | 4 +-
gtk/gtktoolpalette.h | 4 +-
gtk/gtktreeviewcolumn.c | 2 +-
gtk/gtktreeviewcolumn.h | 2 +-
gtk/gtkvbox.c | 18 +-
gtk/gtkwidget.c | 2 +-
gtk/gtkwidget.h | 2 +-
gtk/gtkwidgetpath.c | 2 +-
gtk/gtkwidgetpath.h | 2 +-
gtk/gtkwindow.c | 4 +-
gtk/gtkwindow.h | 10 +-
modules/printbackends/cups/gtkprintercups.c | 2 +
po-properties/he.po | 111 +-
tests/reftests/Makefile.am | 1 -
126 files changed, 4932 insertions(+), 4840 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]