[pygobject: 143/143] Merge branch 'pygi'

[Tomeu Vizoso <tomeuv src gnome org>]

commit fb1ee243493616d7a7e4f6924c574db39f5a423d
Merge: acf7b43 5f9cb91
Author: Tomeu Vizoso <tomeu vizoso collabora co uk>
Date:   Wed Jun 23 12:53:05 2010 +0200

    Merge branch 'pygi'

 Makefile.am                                      |   14 +-
 configure.ac                                     |   29 +-
 demos/gtk-demo/demos/appwindow.py                |  411 +++++
 demos/gtk-demo/demos/assistant.py                |  134 ++
 demos/gtk-demo/demos/builder.py                  |   57 +
 demos/gtk-demo/demos/button_box.py               |  121 ++
 demos/gtk-demo/demos/clipboard.py                |  238 +++
 demos/gtk-demo/demos/colorselector.py            |  121 ++
 demos/gtk-demo/demos/combobox.py                 |  282 ++++
 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/test.py                     |   14 +
 demos/gtk-demo/gtk-demo.py                       |  266 +++
 examples/Makefile.am                             |    2 +-
 examples/cairo-demo.py                           |  121 ++
 gi/.gitignore                                    |   40 +
 gi/HACKING                                       |   26 +
 gi/Makefile.am                                   |   67 +
 gi/__init__.py                                   |   24 +
 gi/gimodule.c                                    |  297 ++++
 gi/importer.py                                   |   85 +
 gi/module.py                                     |  216 +++
 gi/overrides/GIMarshallingTests.py               |   67 +
 gi/overrides/Gdk.py                              |   77 +
 gi/overrides/Gtk.py                              |  348 ++++
 gi/overrides/Makefile.am                         |   12 +
 gi/overrides/keysyms.py                          | 1499 +++++++++++++++++
 gi/pygi-argument.c                               | 1956 ++++++++++++++++++++++
 gi/pygi-argument.h                               |   66 +
 gi/pygi-boxed.c                                  |  196 +++
 gi/pygi-boxed.h                                  |   40 +
 gi/pygi-callbacks.c                              |  223 +++
 gi/pygi-callbacks.h                              |   48 +
 gi/pygi-closure.c                                |  399 +++++
 gi/pygi-closure.h                                |   57 +
 gi/pygi-foreign-cairo.c                          |  103 ++
 gi/pygi-foreign-cairo.h                          |   55 +
 gi/pygi-foreign.c                                |  125 ++
 gi/pygi-foreign.h                                |   52 +
 gi/pygi-info.c                                   | 1518 +++++++++++++++++
 gi/pygi-info.h                                   |   66 +
 gi/pygi-invoke.c                                 | 1003 +++++++++++
 gi/pygi-invoke.h                                 |   37 +
 gi/pygi-private.h                                |   59 +
 gi/pygi-repository.c                             |  238 +++
 gi/pygi-repository.h                             |   39 +
 gi/pygi-struct.c                                 |  169 ++
 gi/pygi-struct.h                                 |   40 +
 gi/pygi-type.c                                   |   96 ++
 gi/pygi-type.h                                   |   43 +
 gi/pygi.h                                        |  105 ++
 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                                      |  180 ++
 pre-commit.hook                                  |   39 +
 pygi-convert.sh                                  |  152 ++
 pygobject.doap                                   |   16 +-
 tests/Makefile.am                                |   25 +-
 tests/test_everything.py                         |  270 +++
 tests/test_gi.py                                 | 1624 ++++++++++++++++++
 tests/test_overrides.py                          |  170 ++
 77 files changed, 14187 insertions(+), 12 deletions(-)
---
diff --cc tests/Makefile.am
index fcdffe1,2cf98a4..3bb37eb
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -19,9 -18,8 +19,9 @@@ testhelper_la_LDFLAGS = -module -avoid-
  testhelper_la_LIBADD = $(GLIB_LIBS)
  testhelper_la_SOURCES = \
  	testhelpermodule.c \
 +	test-floating.c \
  	test-thread.c \
- 	test-unknown.c 
+ 	test-unknown.c
  
  tests =  \
  	test_gicon.py \