[gcompris] Change python plugin init order to have _gcompris first
- From: Bruno Coudoin <bcoudoin src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gcompris] Change python plugin init order to have _gcompris first
- Date: Sun, 10 Feb 2013 16:30:26 +0000 (UTC)
commit e93ff9eb9932ee510f21ddb549efbc12817c4a1d
Author: Bruno Coudoin <bruno coudoin free fr>
Date: Sun Feb 10 17:26:23 2013 +0100
Change python plugin init order to have _gcompris first
To use the runit.sh script, it was needed to create a link
to gcompris python plugin. This was hard to understand why
it was not working when missing.
Now we init first the internal _gcompris python plugin
and the runit script add the directory to the python plugin
so that the link is no more needed.
src/administration-activity/gcompris | 1 -
src/algorithm-activity/gcompris | 1 -
src/anim-activity/gcompris | 1 -
src/ballcatch-activity/gcompris | 1 -
src/bargame-activity/gcompris | 1 -
src/boards/python.c | 5 +++--
src/braille_alphabets-activity/gcompris | 1 -
src/braille_fun-activity/gcompris | 1 -
src/braille_lotto-activity/gcompris | 1 -
src/chat-activity/gcompris | 1 -
src/clickanddraw-activity/gcompris | 1 -
src/color_mix-activity/gcompris | 1 -
src/color_mix_light-activity/gcompris | 1 -
src/connect4-activity/gcompris | 1 -
src/draw-activity/gcompris | 1 -
src/drawnumber-activity/gcompris | 1 -
src/electric-activity/gcompris | 1 -
src/explore-activity/gcompris | 1 -
src/explore_farm_animals-activity/gcompris | 1 -
src/explore_world_animals-activity/gcompris | 1 -
src/explore_world_music-activity/gcompris | 1 -
src/findit-activity/gcompris | 1 -
src/followline-activity/gcompris | 1 -
src/gnumch-equality-activity/gcompris | 1 -
src/gnumch-factors-activity/gcompris | 1 -
src/gnumch-inequality-activity/gcompris | 1 -
src/gnumch-multiples-activity/gcompris | 1 -
src/gnumch-primes-activity/gcompris | 1 -
src/guessnumber-activity/gcompris | 1 -
src/hangman-activity/gcompris | 1 -
src/hexagon-activity/gcompris | 1 -
src/hydroelectric-activity/gcompris | 1 -
src/intro_gravity-activity/gcompris | 1 -
src/land_safe-activity/gcompris | 1 -
src/lang-activity/gcompris | 1 -
src/lightsoff-activity/gcompris | 1 -
src/login-activity/gcompris | 1 -
src/louis_braille-activity/gcompris | 1 -
src/melody-activity/gcompris | 1 -
src/mining-activity/gcompris | 1 -
src/mosaic-activity/gcompris | 1 -
src/note_names-activity/gcompris | 1 -
src/penalty-activity/gcompris | 1 -
src/piano_composition-activity/gcompris | 1 -
src/place_your_satellite-activity/gcompris | 1 -
src/play_piano-activity/gcompris | 1 -
src/play_rhythm-activity/gcompris | 1 -
src/pythontemplate-activity/gcompris | 1 -
src/pythontest-activity/gcompris | 1 -
src/redraw-activity/gcompris | 1 -
src/redraw_symmetrical-activity/gcompris | 1 -
src/runit.sh | 2 +-
src/searace-activity/gcompris | 1 -
src/searace1player-activity/gcompris | 1 -
src/sudoku-activity/gcompris | 1 -
src/tuxpaint-activity/gcompris | 1 -
src/watercycle-activity/gcompris | 1 -
57 files changed, 4 insertions(+), 58 deletions(-)
---
diff --git a/src/boards/python.c b/src/boards/python.c
index 3146b8d..4f92684 100644
--- a/src/boards/python.c
+++ b/src/boards/python.c
@@ -208,13 +208,14 @@ init_config_boards()
return;
}
+ /* Load the gcompris modules */
+ python_gcompris_module_init();
+
/* Add the python plugins dir to the python's search path */
boarddir = get_pythonpath();
PyRun_SimpleString(boarddir);
g_free(boarddir);
- /* Load the gcompris modules */
- python_gcompris_module_init();
}
else {
main_module = PyImport_AddModule("__main__"); /* Borrowed reference */
diff --git a/src/runit.sh b/src/runit.sh
index fd476cd..6893095 100755
--- a/src/runit.sh
+++ b/src/runit.sh
@@ -31,7 +31,7 @@ fi
sed -e "s/\(<\{1\}\/*\)_/\1/g" $1/${activity}.xml.in > $1/${activity}.xml
$gcompris -L $plugindir \
- -P $pythonplugindir \
+ -P boards/python:$pythonplugindir \
-A $resourcedir \
-S $menudir/../../boards/skins \
-M $menudir \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]