[pygobject/windows: 314/316] Merge branch 'master' into windows



commit 7872f7b7d0a5b9aa58bca10427c3a0d779c2e174
Merge: 2730271 33b59fd
Author: John Stowers <john stowers gmail com>
Date:   Sat Oct 16 18:23:10 2010 +1300

    Merge branch 'master' into windows

 .gitignore                                       |    5 +-
 HACKING                                          |   16 +
 MAINTAINERS                                      |    8 +
 MANIFEST.in                                      |    2 +-
 Makefile.am                                      |   15 +-
 NEWS                                             |  166 ++
 README                                           |    1 +
 autogen.sh                                       |  506 +------
 codegen/codegen.py                               |    2 +
 codegen/docextract_to_xml.py                     |    4 +-
 codegen/reversewrapper.py                        |   18 +-
 configure.ac                                     |   93 +-
 demos/gtk-demo/demos/Entry/entry_buffer.py       |   73 +
 demos/gtk-demo/demos/Entry/entry_completion.py   |   87 +
 demos/gtk-demo/demos/appwindow.py                |  424 +++++
 demos/gtk-demo/demos/assistant.py                |  134 ++
 demos/gtk-demo/demos/builder.py                  |   63 +
 demos/gtk-demo/demos/button_box.py               |  121 ++
 demos/gtk-demo/demos/clipboard.py                |  232 +++
 demos/gtk-demo/demos/colorselector.py            |  121 ++
 demos/gtk-demo/demos/combobox.py                 |  284 ++++
 demos/gtk-demo/demos/data/alphatest.png          |  Bin 0 -> 26529 bytes
 demos/gtk-demo/demos/data/apple-red.png          |  Bin 0 -> 3545 bytes
 demos/gtk-demo/demos/data/background.jpg         |  Bin 0 -> 22219 bytes
 demos/gtk-demo/demos/data/demo.ui                |  258 +++
 demos/gtk-demo/demos/data/floppybuddy.gif        |  Bin 0 -> 5216 bytes
 demos/gtk-demo/demos/data/gnome-applets.png      |  Bin 0 -> 3090 bytes
 demos/gtk-demo/demos/data/gnome-calendar.png     |  Bin 0 -> 2755 bytes
 demos/gtk-demo/demos/data/gnome-foot.png         |  Bin 0 -> 2916 bytes
 demos/gtk-demo/demos/data/gnome-fs-directory.png |  Bin 0 -> 2044 bytes
 demos/gtk-demo/demos/data/gnome-fs-regular.png   |  Bin 0 -> 1795 bytes
 demos/gtk-demo/demos/data/gnome-gimp.png         |  Bin 0 -> 3410 bytes
 demos/gtk-demo/demos/data/gnome-gmush.png        |  Bin 0 -> 3244 bytes
 demos/gtk-demo/demos/data/gnome-gsame.png        |  Bin 0 -> 4263 bytes
 demos/gtk-demo/demos/data/gnu-keys.png           |  Bin 0 -> 3852 bytes
 demos/gtk-demo/demos/data/gtk-logo-rgb.gif       |  Bin 0 -> 6427 bytes
 demos/gtk-demo/demos/drawingarea.py              |  249 +++
 demos/gtk-demo/demos/test.py                     |   14 +
 demos/gtk-demo/gtk-demo.py                       |  302 ++++
 docs/reference/pygio-mount.xml                   |    5 +-
 docs/reference/pyglib-functions.xml              |   18 +-
 docs/reference/pyglib-maincontext.xml            |   12 +-
 docs/reference/pyglib-mainloop.xml               |    6 +-
 docs/reference/pygobject-functions.xml           |    6 +-
 docs/reference/pygobject.xml                     |    4 +-
 dsextras.py                                      |   29 +-
 examples/Makefile.am                             |    2 +-
 examples/cairo-demo.py                           |  123 ++
 gi/.gitignore                                    |   40 +
 gi/HACKING                                       |   26 +
 gi/Makefile.am                                   |   89 +
 gi/__init__.py                                   |   27 +
 gi/gimodule.c                                    |  337 ++++
 gi/importer.py                                   |   78 +
 gi/module.py                                     |  237 +++
 gi/overrides/GIMarshallingTests.py               |   67 +
 gi/overrides/GLib.py                             |  165 ++
 gi/overrides/Gdk.py                              |  125 ++
 gi/overrides/Gtk.py                              |  460 ++++++
 gi/overrides/Makefile.am                         |   13 +
 gi/overrides/keysyms.py                          | 1499 +++++++++++++++++
 gi/pygi-argument.c                               | 1862 ++++++++++++++++++++++
 gi/pygi-argument.h                               |   68 +
 gi/pygi-boxed.c                                  |  182 +++
 gi/pygi-boxed.h                                  |   42 +
 gi/pygi-callbacks.c                              |  221 +++
 gi/pygi-callbacks.h                              |   48 +
 gi/pygi-closure.c                                |  389 +++++
 gi/pygi-closure.h                                |   57 +
 gi/pygi-foreign-cairo.c                          |  134 ++
 gi/pygi-foreign-gvariant.c                       |   63 +
 gi/pygi-foreign-gvariant.h                       |   41 +
 gi/pygi-foreign.c                                |  176 ++
 gi/pygi-foreign.h                                |   48 +
 gi/pygi-info.c                                   | 1452 +++++++++++++++++
 gi/pygi-info.h                                   |   66 +
 gi/pygi-invoke.c                                 |  921 +++++++++++
 gi/pygi-invoke.h                                 |   37 +
 gi/pygi-private.h                                |   83 +
 gi/pygi-property.c                               |  345 ++++
 gi/pygi-property.h                               |   39 +
 gi/pygi-repository.c                             |  269 ++++
 gi/pygi-repository.h                             |   39 +
 gi/pygi-struct.c                                 |  146 ++
 gi/pygi-struct.h                                 |   40 +
 gi/pygi-type.c                                   |   99 ++
 gi/pygi-type.h                                   |   45 +
 gi/pygi.h                                        |  174 ++
 gi/pygobject-external.h                          |   83 +
 gi/repository/Makefile.am                        |    8 +
 gi/repository/__init__.py                        |   30 +
 gi/tests/Makefile.am                             |   22 +
 gi/tests/runtests.py                             |   21 +
 gi/types.py                                      |  185 +++
 gio/Makefile.am                                  |    1 +
 gio/gappinfo.override                            |    5 +
 gio/gfile.override                               |  240 +++-
 gio/gio.override                                 |    7 +-
 gio/giomodule.c                                  |  153 +-
 gio/gresolver.override                           |    2 +-
 gio/pygio-utils.c                                |   42 +-
 gio/unix.override                                |    2 +
 glib/Makefile.am                                 |    2 +-
 glib/glibmodule.c                                |  152 ++-
 glib/option.py                                   |   22 +-
 glib/pygiochannel.c                              |  112 +-
 glib/pyglib-python-compat.h                      |  189 ++-
 glib/pyglib.c                                    |  116 ++-
 glib/pyglib.h                                    |   17 +-
 glib/pygmaincontext.c                            |   17 +-
 glib/pygmainloop.c                               |   17 +-
 glib/pygoptioncontext.c                          |   24 +-
 glib/pygoptiongroup.c                            |   22 +-
 glib/pygsource.c                                 |   20 +-
 glib/pygspawn.c                                  |   33 +-
 gobject/Makefile.am                              |   10 +-
 gobject/__init__.py                              |    2 +-
 gobject/gobjectmodule.c                          |  226 ++--
 gobject/propertyhelper.py                        |   16 +-
 gobject/pygboxed.c                               |   22 +-
 gobject/pygenum.c                                |  126 +-
 gobject/pygflags.c                               |  179 +--
 gobject/pygi-external.h                          |   65 -
 gobject/pygobject-private.h                      |   12 +-
 gobject/pygobject.c                              |  169 ++-
 gobject/pygobject.h                              |   30 +
 gobject/pygparamspec.c                           |   43 +-
 gobject/pygpointer.c                             |   21 +-
 gobject/pygtype.c                                |  232 ++--
 m4/python.m4                                     |    4 +-
 pre-commit.hook                                  |   39 +
 pygi-convert.sh                                  |  176 ++
 pygobject.doap                                   |   23 +-
 setup.py                                         |    6 +-
 tests/Makefile.am                                |  142 ++-
 tests/common.py                                  |   48 -
 tests/compathelper.py                            |   50 +
 tests/runtests.py                                |   54 +-
 tests/test-floating.c                            |   95 ++
 tests/test-floating.h                            |   60 +
 tests/test_everything.py                         |  358 +++++
 tests/test_gcancellable.py                       |    4 +-
 tests/test_gi.py                                 | 1512 ++++++++++++++++++
 tests/test_gicon.py                              |    3 +-
 tests/test_gio.py                                |    3 +-
 tests/test_gobject.py                            |   20 +-
 tests/test_gresolver.py                          |    4 +-
 tests/test_gsocket.py                            |    4 +-
 tests/test_interface.py                          |    6 +-
 tests/test_mainloop.py                           |   14 +-
 tests/test_option.py                             |   13 +-
 tests/test_overrides.py                          |  300 ++++
 tests/test_properties.py                         |   24 +-
 tests/test_signal.py                             |   16 +-
 tests/test_source.py                             |    8 +-
 tests/test_subprocess.py                         |    5 +-
 tests/test_thread.py                             |    5 +-
 tests/test_unknown.py                            |    5 +-
 tests/test_uris.py                               |   15 +
 tests/testhelpermodule.c                         |  148 +--
 160 files changed, 17859 insertions(+), 1654 deletions(-)
---



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