[gtk+/quartz-integration: 264/264] Merge branch 'master' into quartz-integration
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration: 264/264] Merge branch 'master' into quartz-integration
- Date: Thu, 6 Jan 2011 22:25:05 +0000 (UTC)
commit ca111a69a070cec423443e301fde44f5d952f3ea
Merge: 5253668 7b88b29
Author: John Ralls <jralls ceridwen us>
Date: Wed Jan 5 23:21:13 2011 -0800
Merge branch 'master' into quartz-integration
NEWS | 12 +-
configure.ac | 10 +-
demos/gtk-demo/changedisplay.c | 3 +
demos/testpixbuf-scale.c | 4 +-
docs/reference/gtk/Makefile.am | 6 +-
docs/reference/gtk/building.sgml | 113 +-
docs/reference/gtk/compiling.sgml | 19 -
docs/reference/gtk/getting_started.xml | 2 +-
docs/reference/gtk/gtk-docs.sgml | 1 +
docs/reference/gtk/gtk3-sections.txt | 37 +-
docs/reference/gtk/gtk3.types | 1 +
docs/reference/gtk/images/appchooserbutton.png | Bin 0 -> 5115 bytes
docs/reference/gtk/images/appchooserdialog.png | Bin 0 -> 52118 bytes
docs/reference/gtk/images/numerableicon.png | Bin 0 -> 2645 bytes
docs/reference/gtk/images/numerableicon2.png | Bin 0 -> 2329 bytes
docs/reference/gtk/migrating-2to3.xml | 9 +-
docs/reference/gtk/visual_index.xml | 6 +
docs/reference/libgail-util/Makefile.am | 6 +-
.../libgail-util/gail-libgail-util-docs.sgml | 1 +
docs/reference/libgail-util/version.xml.in | 1 +
docs/tools/widgets.c | 35 +
examples/Makefile.am | 2 +-
.../bloatpad.c | 0
examples/gtkdial/dial_test.c | 2 +-
examples/gtkdial/gtkdial.c | 54 +-
examples/hello-world.c | 3 +-
gdk/win32/Makefile.am | 15 +-
gtk/Makefile.am | 3 +
gtk/gtk.h | 1 +
gtk/gtk.symbols | 18 +-
gtk/gtkadjustment.c | 100 +-
gtk/gtkadjustment.h | 12 +-
gtk/gtkappchooser.c | 11 +
gtk/gtkappchooserbutton.c | 8 +
gtk/gtkappchooserdialog.c | 12 +
gtk/gtkappchooserwidget.c | 11 +
gtk/gtkapplication.c | 2 +-
gtk/gtkcellarea.c | 4 +-
gtk/gtkcellareacontext.c | 3 +-
gtk/gtkcelllayout.c | 4 +-
gtk/gtkcellrenderer.c | 10 +-
gtk/gtkcellrendererspinner.c | 8 +-
gtk/gtkcellrenderertext.c | 15 +-
gtk/gtkcolorsel.c | 8 +-
gtk/gtkcombobox.c | 20 +-
gtk/gtkenums.h | 8 -
gtk/gtkexpander.c | 7 +-
gtk/gtkfilechooserdefault.c | 24 +-
gtk/gtkicontheme.c | 4 +
gtk/gtkiconview.c | 2195 +++++----------
gtk/gtkiconview.h | 2 +
gtk/gtklayout.c | 8 +-
gtk/gtkliststore.c | 23 +
gtk/gtkmain.c | 40 +-
gtk/gtkmenu.c | 41 +-
gtk/gtknumerableicon.c | 1048 +++++++
gtk/gtknumerableicon.h | 89 +
gtk/gtknumerableiconprivate.h | 32 +
gtk/gtkrange.c | 330 +--
gtk/gtkrange.h | 4 -
gtk/gtkscalebutton.c | 62 +-
gtk/gtkscrolledwindow.c | 26 +-
gtk/gtkshow.c | 2 +-
gtk/gtkspinbutton.c | 190 +-
gtk/gtkspinner.c | 37 -
gtk/gtkstyle.c | 4 +-
gtk/gtktestutils.c | 11 +-
gtk/gtktexttag.h | 26 +-
gtk/gtktextview.c | 147 +-
gtk/gtkthemingengine.c | 8 +-
gtk/gtktoolitemgroup.c | 8 +-
gtk/gtktoolpalette.c | 26 +-
gtk/gtktreemodel.c | 53 +
gtk/gtktreemodel.h | 4 +
gtk/gtktreemodelfilter.c | 38 +
gtk/gtktreemodelsort.c | 28 +
gtk/gtktreestore.c | 28 +-
gtk/gtktreeview.c | 174 +-
gtk/gtkviewport.c | 135 +-
gtk/gtkvolumebutton.c | 10 +-
gtk/gtkwidget.c | 42 +-
gtk/gtkwindow.c | 173 +-
gtk/tests/Makefile.am | 6 +-
gtk/tests/liststore.c | 83 +
gtk/tests/treestore.c | 83 +
gtk/tests/treeview-scrolling.c | 52 +-
modules/other/gail/gailadjustment.c | 26 +-
modules/other/gail/gailwidget.c | 4 +-
po-properties/POTFILES.in | 16 +-
po-properties/pa.po | 3026 +++++++++++---------
po/POTFILES.in | 11 +-
po/et.po | 106 +-
po/pa.po | 1087 ++++----
tests/Makefile.am | 15 +-
tests/prop-editor.c | 24 +-
tests/testgtk.c | 128 +-
tests/testnumerableicon.c | 198 ++
tests/testsocket.c | 15 +-
tests/testtoplevelembed.c | 103 +
tests/testtreemenu.c | 2 +-
100 files changed, 6146 insertions(+), 4518 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
