[gtk+/gtkbuilder-gbinding: 212/212] Merge branch 'master' into gtkbuilder-gbinding
- From: Denis Washington <denisw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtkbuilder-gbinding: 212/212] Merge branch 'master' into gtkbuilder-gbinding
- Date: Fri, 19 Aug 2011 10:44:49 +0000 (UTC)
commit 09f188d2ddc63c961ecff50ee44bc37cc56ea297
Merge: 173bd16 d539ebb
Author: Denis Washington <denisw online de>
Date: Fri Aug 19 12:43:57 2011 +0200
Merge branch 'master' into gtkbuilder-gbinding
Makefile.am | 1 +
NEWS | 40 +
README.in | 7 +
autogen.sh | 2 +
build/win32/vs10/gtk+.props | 17 +
build/win32/vs9/gtk+.vsprops | 9 +
configure.ac | 4 +-
demos/gtk-demo/main.c | 2 +-
docs/Makefile.am | 1 -
docs/generation.txt | 177 --
docs/reference/gtk/gtk-docs.sgml | 2 +
docs/reference/gtk/gtk3-sections.txt | 63 +
gdk/Makefile.am | 1 -
gdk/gdkwindow.c | 2 +-
gdk/makeenums.pl | 279 --
gdk/quartz/gdkdevice-core-quartz.c | 6 +-
gdk/quartz/gdkevents-quartz.c | 102 +-
gdk/quartz/gdkglobals-quartz.c | 17 +
gdk/quartz/gdkprivate-quartz.h | 4 +-
gdk/quartz/gdkquartz.h | 15 +
gdk/quartz/gdkwindow-quartz.c | 34 +-
gdk/win32/Makefile.am | 10 +
gdk/x11/gdkcursor-x11.c | 12 +-
gdk/x11/gdkdisplay-x11.c | 24 +-
gdk/x11/gdkmain-x11.c | 10 +-
gdk/x11/gdkproperty-x11.c | 16 +-
gdk/x11/gdkscreen-x11.c | 12 +-
gdk/x11/gdkselection-x11.c | 6 +-
gdk/x11/gdksettings.c | 6 +-
gdk/x11/gdkvisual-x11.c | 6 +-
gdk/x11/gdkwindow-x11.c | 17 +-
gdk/x11/gdkxid.c | 3 +-
gtk/Makefile.am | 15 +-
gtk/a11y/gtkentryaccessible.c | 2 +-
gtk/a11y/gtklabelaccessible.c | 2 +-
gtk/gtk.h | 2 +
gtk/gtk.symbols | 26 +
gtk/gtkappchooser.c | 2 +-
gtk/gtkassistant.h | 2 +-
gtk/gtkbutton.c | 13 +-
gtk/gtkcalendar.c | 4 +-
gtk/gtkcellarea.c | 3 +
gtk/gtkcheckbutton.c | 25 +-
gtk/gtkclipboard-quartz.c | 7 +-
gtk/gtkcolorsel.c | 2 +-
gtk/gtkcombobox.c | 4 +
gtk/gtkcomboboxtext.c | 4 +-
gtk/gtkentry.c | 23 +-
gtk/gtkexpander.c | 4 +-
gtk/gtkfilechooserdefault.c | 501 ++--
gtk/gtkfilechooserprivate.h | 1 +
gtk/gtkfilefilter.c | 6 +-
gtk/gtkfontbutton.c | 99 +-
gtk/gtkfontchooser.c | 1332 ++++++++
gtk/gtkfontchooser.h | 106 +
gtk/gtkfontchooserdialog.c | 311 ++
gtk/gtkfontchooserdialog.h | 76 +
gtk/gtkfontsel.c | 55 +-
gtk/gtkfontsel.h | 4 +
gtk/gtkgrid.c | 136 +
gtk/gtkgrid.h | 7 +
gtk/gtkhsv.c | 27 +-
gtk/gtkiconview.c | 1268 ++------
gtk/gtklabel.c | 3 +-
gtk/gtkmain.c | 12 +-
gtk/gtknotebook.c | 4 +-
gtk/gtkrange.c | 2 +-
gtk/gtkrecentfilter.c | 6 +-
gtk/gtksettings.c | 19 +
gtk/gtkspinbutton.c | 34 +-
gtk/gtkstylecontext.c | 1 +
gtk/gtkstylecontext.h | 9 +
gtk/gtkstyleproperty.c | 5 +-
gtk/gtkswitch.c | 2 +-
gtk/gtktextiter.c | 22 +
gtk/gtktextiter.h | 6 +-
gtk/gtktexttag.c | 8 +-
gtk/gtktextview.c | 2 +-
gtk/gtktrayicon-x11.c | 2 +-
gtk/gtktreeview.c | 8 +-
gtk/gtkwidget.c | 55 +-
gtk/gtkwidget.h | 1 +
gtk/gtkwindow.c | 111 +-
gtk/gtkwindow.h | 3 +
gtk/makeenums.pl | 216 --
gtk/org.gtk.Settings.FileChooser.gschema.xml | 3 +
gtk/tests/Makefile.am | 1 -
m4/introspection.m4 | 94 -
modules/printbackends/cups/gtkcupsutils.c | 78 +-
modules/printbackends/cups/gtkcupsutils.h | 4 +-
modules/printbackends/cups/gtkprintbackendcups.c | 26 +-
po-properties/bg.po | 2887 +++++++++---------
po-properties/es.po | 1183 ++++----
po-properties/gl.po | 1179 ++++----
po-properties/pa.po | 3440 +++++++++++----------
po-properties/sv.po | 3620 +++++++++++-----------
po/bg.po | 986 ++++---
po/gl.po | 378 ++--
po/id.po | 1498 +++++----
po/it.po | 1316 +++++----
po/pa.po | 1035 ++++---
po/pt_BR.po | 1009 ++++---
po/ru.po | 999 ++++---
po/sv.po | 1542 ++++------
po/ug.po | 450 ++--
po/zh_HK.po | 1077 ++++---
po/zh_TW.po | 1077 ++++---
tests/Makefile.am | 24 +
tests/css/parser/Makefile.am | 1 +
tests/testfontchooser.c | 67 +
tests/testfontchooserdialog.c | 36 +
tests/testfontselection.c | 80 +
tests/testfontselectiondialog.c | 43 +
tests/testgrid.c | 74 +
tests/testgtk.c | 11 -
tests/testtoplevelembed.c | 2 +-
tests/widget-factory.c | 24 +-
tests/widget-factory.ui | 19 +-
118 files changed, 16276 insertions(+), 13494 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]