[libpeas: 18/18] Merge remote-tracking branch 'gregier/fixes'



commit e659d2bc6879ce32710ef678917be3edfac07a7e
Merge: b812820 7f193c7
Author: Steve Frécinaux <code istique net>
Date:   Fri Mar 4 10:37:10 2011 +0100

    Merge remote-tracking branch 'gregier/fixes'

 .gitignore                                         |    1 +
 Makefile.am                                        |   22 +++++-
 Makefile.gcov                                      |   37 ++++++++
 configure.ac                                       |   34 +++++++
 libpeas-gtk/Makefile.am                            |    7 ++-
 libpeas/Makefile.am                                |   22 +++--
 libpeas/peas-engine.c                              |    6 +-
 loaders/Makefile.am                                |    5 +
 loaders/c/Makefile.am                              |    6 +-
 loaders/c/peas-plugin-loader-c.c                   |   16 ++--
 loaders/python/Makefile.am                         |    6 +-
 loaders/python/peas-plugin-loader-python.c         |    2 +-
 loaders/seed/Makefile.am                           |    6 +-
 loaders/seed/peas-plugin-loader-seed.c             |   29 ++++++-
 tests/Makefile.tests                               |    2 +
 tests/libpeas-gtk/plugin-manager-store.c           |    2 +-
 tests/libpeas-gtk/plugin-manager-view.c            |    2 +-
 tests/libpeas-gtk/plugin-manager.c                 |    2 +-
 tests/libpeas-gtk/testing/testing.c                |   57 ++++++++----
 tests/libpeas-gtk/testing/testing.h                |    4 +
 tests/libpeas/engine.c                             |   92 ++++++++++++++++----
 tests/libpeas/extension-python.c                   |    7 ++-
 tests/libpeas/extension-seed.c                     |    7 ++-
 tests/libpeas/extension-set.c                      |    2 +-
 tests/libpeas/plugin-info.c                        |    2 +-
 tests/libpeas/plugins/Makefile.am                  |    4 +-
 ...ader-disabled.plugin => disabled-loader.plugin} |    4 +-
 tests/libpeas/plugins/invalid-loader.plugin        |    8 ++
 tests/libpeas/plugins/invalid.plugin               |    1 +
 tests/libpeas/testing/testing-extension.c          |   77 ++++++++++++++++-
 tests/libpeas/testing/testing-extension.h          |   10 ++-
 tests/libpeas/testing/testing.c                    |   22 ++++-
 tests/libpeas/testing/testing.h                    |    3 +
 33 files changed, 426 insertions(+), 81 deletions(-)
---



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