[libpeas: 36/38] Merge branch 'proxys'

[Steve Frécinaux <sfre src gnome org>]

commit 55c4cf05a3fa22d40c9a3f39c48ce7479a552db6
Merge: d0bae13 f2193d7
Author: Steve Frécinaux <code istique net>
Date:   Wed May 26 20:08:14 2010 +0200

    Merge branch 'proxys'

 .gitignore                                         |    2 +
 configure.ac                                       |  174 +++-----
 libpeas/Makefile.am                                |   36 ++-
 libpeas/peas-activatable.c                         |  106 +++++
 libpeas/peas-activatable.h                         |   67 +++
 libpeas/peas-engine.c                              |  177 ++-------
 libpeas/peas-engine.h                              |   24 +-
 libpeas/peas-extension-base.c                      |  176 ++++++++
 libpeas/peas-extension-base.h                      |   72 ++++
 libpeas/peas-extension-set.c                       |  258 +++++++++++
 libpeas/peas-extension-set.h                       |   83 ++++
 libpeas/peas-extension.c                           |   83 ++++
 libpeas/peas-extension.h                           |   75 ++++
 libpeas/peas-introspection.c                       |  221 ++++++++++
 libpeas/peas-introspection.h                       |   41 ++
 libpeas/peas-marshal.list                          |    1 +
 libpeas/peas-object-module.c                       |  124 ++++--
 libpeas/peas-object-module.h                       |   21 +-
 libpeas/peas-plugin-info-priv.h                    |    3 +-
 libpeas/peas-plugin-info.c                         |    6 +-
 libpeas/peas-plugin-loader.c                       |   36 ++-
 libpeas/peas-plugin-loader.h                       |   38 +-
 libpeas/peas-plugin.c                              |  249 -----------
 libpeas/peas-plugin.h                              |  159 -------
 libpeasui/Makefile.am                              |    2 +-
 libpeasui/peas-ui-configurable.c                   |   18 +-
 libpeasui/peas-ui-configurable.h                   |    6 +-
 libpeasui/peas-ui-plugin-info.c                    |   68 ---
 libpeasui/peas-ui-plugin-info.h                    |    2 -
 libpeasui/peas-ui-plugin-manager.c                 |   30 +-
 loaders/c/Makefile.am                              |    2 +
 loaders/c/peas-extension-c.c                       |   88 ++++
 loaders/c/peas-extension-c.h                       |   58 +++
 loaders/c/peas-plugin-loader-c.c                   |   85 +++-
 loaders/c/peas-plugin-loader-c.h                   |    3 +-
 loaders/python/Makefile.am                         |    4 +-
 loaders/python/bindings/Makefile.am                |  106 -----
 loaders/python/bindings/libpeas.defs.extra         |   31 --
 loaders/python/bindings/libpeas.override           |   15 -
 loaders/python/bindings/libpeasmodule.c            |   52 ---
 loaders/python/bindings/libpeasui.defs.extra       |    9 -
 loaders/python/bindings/libpeasui.override         |   21 -
 loaders/python/bindings/libpeasuimodule.c          |   97 -----
 loaders/python/peas-extension-python.c             |   99 +++++
 loaders/python/peas-extension-python.h             |   59 +++
 loaders/python/peas-plugin-loader-python.c         |  240 +++++------
 loaders/python/peas-plugin-loader-python.h         |    3 +-
 loaders/seed/Makefile.am                           |    4 +-
 loaders/seed/peas-extension-seed.c                 |  449 ++++++++++++++++++++
 loaders/seed/peas-extension-seed.h                 |   62 +++
 loaders/seed/peas-plugin-loader-seed.c             |  110 ++++-
 loaders/seed/peas-plugin-loader-seed.h             |    5 +-
 loaders/seed/peas-seed-plugin.c                    |  213 ---------
 loaders/seed/peas-seed-plugin.h                    |   61 ---
 peas-demo/Makefile.am                              |    2 +
 peas-demo/peas-demo-window.c                       |  120 ++++++
 peas-demo/peas-demo-window.h                       |   66 +++
 peas-demo/peas-demo.c                              |   37 +--
 .../helloworld/peasdemo-hello-world-plugin.c       |   60 ++--
 .../helloworld/peasdemo-hello-world-plugin.h       |    9 +-
 peas-demo/plugins/pythonhello/pythonhello.py       |   16 +-
 peas-demo/plugins/seedhello/seedhello.js           |   27 ++-
 62 files changed, 2888 insertions(+), 1683 deletions(-)
---