GitLab repository storage has been migrated to hashed layout. Please contact Infrastructure team if you notice any issues with repositories or hooks.

Commit 8ba011e2 authored by Bruno Coudoin's avatar Bruno Coudoin

Removed the babytoy skin from traffic, keep only the best one.

svn path=/branches/gcomprixo/; revision=2835
parent 41fe7bad
......@@ -543,30 +543,8 @@ Makefile.mingw
autopackage/Makefile
autopackage/default.apspec
boards/Makefile
src/advanced_colors-activity/resources/Makefile
src/advanced_colors-activity/resources/advanced_colors/Makefile
src/babymatch-activity/resources/Makefile
src/babymatch-activity/resources/babymatch/Makefile
src/babyshapes-activity/resources/Makefile
src/babyshapes-activity/resources/babyshapes/Makefile
src/chronos-activity/resources/Makefile
src/chronos-activity/resources/chronos/Makefile
src/doubleentry-activity/resources/Makefile
src/doubleentry-activity/resources/doubleentry/Makefile
boards/gcompris/Makefile
boards/gcompris/mimetypes/Makefile
src/geography-activity/resources/Makefile
src/geography-activity/resources/geography/Makefile
src/geography_country-activity/resources/Makefile
src/geography_country-activity/resources/geography_country/Makefile
src/imageid-activity/resources/Makefile
src/imageid-activity/resources/imageid/Makefile
src/imagename-activity/resources/Makefile
src/imagename-activity/resources/imagename/Makefile
src/missing_letter-activity/resources/Makefile
src/missing_letter-activity/resources/missing_letter/Makefile
src/paintings-activity/resources/Makefile
src/paintings-activity/resources/paintings/Makefile
config.h.mingw
docs/C/Makefile
docs/Makefile
......@@ -576,28 +554,45 @@ gcompris-installer.nsi
macosx/Makefile
po/Makefile.in
src/Makefile
src/administration-activity/Makefile
src/administration-activity/activity/Makefile
src/administration-activity/admin/Makefile
src/advanced_colors-activity/Makefile
src/advanced_colors-activity/activity/Makefile
src/advanced_colors-activity/resources/Makefile
src/advanced_colors-activity/resources/advanced_colors/Makefile
src/algebra_by-activity/Makefile
src/algebra_by-activity/activity/Makefile
src/algebra_by-activity/resources/Makefile
src/algebra_guesscount-activity/Makefile
src/algebra_guesscount-activity/activity/Makefile
src/algebra_minus-activity/Makefile
src/algebra_minus-activity/activity/Makefile
src/algebra_plus-activity/Makefile
src/algebra_plus-activity/activity/Makefile
src/algorithm-activity/Makefile
src/algorithm-activity/activity/Makefile
src/anim-activity/Makefile
src/anim-activity/activity/Makefile
src/awele-activity/Makefile
src/awele-activity/activity/Makefile
src/babymatch-activity/Makefile
src/babymatch-activity/activity/Makefile
src/babymatch-activity/resources/Makefile
src/babymatch-activity/resources/babymatch/Makefile
src/babyshapes-activity/Makefile
src/babyshapes-activity/activity/Makefile
src/babyshapes-activity/resources/Makefile
src/babyshapes-activity/resources/babyshapes/Makefile
src/ballcatch-activity/Makefile
src/ballcatch-activity/activity/Makefile
src/bargame-activity/Makefile
src/bargame-activity/activity/Makefile
src/billard-activity/Makefile
src/billard-activity/activity/Makefile
src/boards/Makefile
src/writing_tutor_image_match-activity/DTW/Makefile
src/boards/mypaint/Makefile
src/boards/python/Makefile
src/connect4-activity/connect4p/Makefile
src/boards/python/gcompris/Makefile
src/boards/python/gcompris/admin/Makefile
src/boards/python/gcompris/anim/Makefile
......@@ -609,6 +604,8 @@ src/boards/python/gcompris/timer/Makefile
src/boards/python/gcompris/utils/Makefile
src/canal_lock-activity/Makefile
src/canal_lock-activity/activity/Makefile
src/chat-activity/Makefile
src/chat-activity/activity/Makefile
src/chess_computer-activity/Makefile
src/chess_computer-activity/activity/Makefile
src/chess_movelearn-activity/Makefile
......@@ -617,18 +614,35 @@ src/chess_partyend-activity/Makefile
src/chess_partyend-activity/activity/Makefile
src/chronos-activity/Makefile
src/chronos-activity/activity/Makefile
src/chronos-activity/resources/Makefile
src/chronos-activity/resources/chronos/Makefile
src/click_on_letter-activity/Makefile
src/click_on_letter-activity/activity/Makefile
src/clickanddraw-activity/Makefile
src/clickanddraw-activity/activity/Makefile
src/clickgame-activity/Makefile
src/clickgame-activity/activity/Makefile
src/clockgame-activity/Makefile
src/clockgame-activity/activity/Makefile
src/colors-activity/Makefile
src/colors-activity/activity/Makefile
src/connect4-2players-activity/Makefile
src/connect4-2players-activity/activity/Makefile
src/connect4-activity/Makefile
src/connect4-activity/activity/Makefile
src/connect4-activity/connect4p/Makefile
src/crane-activity/Makefile
src/crane-activity/activity/Makefile
src/doubleentry-activity/Makefile
src/doubleentry-activity/activity/Makefile
src/doubleentry-activity/resources/Makefile
src/doubleentry-activity/resources/doubleentry/Makefile
src/draw-activity/Makefile
src/draw-activity/activity/Makefile
src/drawnumber-activity/Makefile
src/drawnumber-activity/activity/Makefile
src/electric-activity/Makefile
src/electric-activity/activity/Makefile
src/enumerate-activity/Makefile
src/enumerate-activity/activity/Makefile
src/erase-activity/Makefile
......@@ -637,25 +651,51 @@ src/erase_clic-activity/Makefile
src/erase_clic-activity/activity/Makefile
src/fifteen-activity/Makefile
src/fifteen-activity/activity/Makefile
src/followline-activity/Makefile
src/followline-activity/activity/Makefile
src/gcompris/Makefile
src/geography-activity/Makefile
src/geography-activity/activity/Makefile
src/geography-activity/resources/Makefile
src/geography-activity/resources/geography/Makefile
src/geography_country-activity/Makefile
src/geography_country-activity/activity/Makefile
src/geography_country-activity/resources/Makefile
src/geography_country-activity/resources/geography_country/Makefile
src/gletters-activity/Makefile
src/gletters-activity/activity/Makefile
src/gnumch-equality-activity/Makefile
src/gnumch-equality-activity/activity/Makefile
src/gnumch-factors-activity/Makefile
src/gnumch-factors-activity/activity/Makefile
src/gnumch-inequality-activity/Makefile
src/gnumch-inequality-activity/activity/Makefile
src/gnumch-multiples-activity/Makefile
src/gnumch-multiples-activity/activity/Makefile
src/gnumch-primes-activity/Makefile
src/gnumch-primes-activity/activity/Makefile
src/guessnumber-activity/Makefile
src/guessnumber-activity/activity/Makefile
src/hanoi-activity/Makefile
src/hanoi-activity/activity/Makefile
src/hanoi_real-activity/Makefile
src/hanoi_real-activity/activity/Makefile
src/hexagon-activity/Makefile
src/hexagon-activity/activity/Makefile
src/imageid-activity/Makefile
src/imageid-activity/activity/Makefile
src/imageid-activity/resources/Makefile
src/imageid-activity/resources/imageid/Makefile
src/imagename-activity/Makefile
src/imagename-activity/activity/Makefile
src/imagename-activity/resources/Makefile
src/imagename-activity/resources/imagename/Makefile
src/leftright-activity/Makefile
src/leftright-activity/activity/Makefile
src/libart_lgpl/Makefile
src/libgnomecanvas/Makefile
src/login-activity/Makefile
src/login-activity/activity/Makefile
src/magic_hat_minus-activity/Makefile
src/magic_hat_minus-activity/activity/Makefile
src/magic_hat_plus-activity/Makefile
......@@ -668,6 +708,8 @@ src/maze3D-activity/Makefile
src/maze3D-activity/activity/Makefile
src/mazeInvisible-activity/Makefile
src/mazeInvisible-activity/activity/Makefile
src/melody-activity/Makefile
src/melody-activity/activity/Makefile
src/memory-activity/Makefile
src/memory-activity/activity/Makefile
src/memory_add-activity/Makefile
......@@ -706,16 +748,26 @@ src/memory_tux-activity/Makefile
src/memory_tux-activity/activity/Makefile
src/missing_letter-activity/Makefile
src/missing_letter-activity/activity/Makefile
src/missing_letter-activity/resources/Makefile
src/missing_letter-activity/resources/missing_letter/Makefile
src/money-activity/Makefile
src/money-activity/activity/Makefile
src/money_cents-activity/Makefile
src/money_cents-activity/activity/Makefile
src/mosaic-activity/Makefile
src/mosaic-activity/activity/Makefile
src/paintings-activity/Makefile
src/paintings-activity/activity/Makefile
src/paintings-activity/resources/Makefile
src/paintings-activity/resources/paintings/Makefile
src/paratrooper-activity/Makefile
src/paratrooper-activity/activity/Makefile
src/planegame-activity/Makefile
src/planegame-activity/activity/Makefile
src/pythontemplate-activity/Makefile
src/pythontemplate-activity/activity/Makefile
src/pythontest-activity/Makefile
src/pythontest-activity/activity/Makefile
src/railroad-activity/Makefile
src/railroad-activity/activity/Makefile
src/read_colors-activity/Makefile
......@@ -724,101 +776,53 @@ src/readingh-activity/Makefile
src/readingh-activity/activity/Makefile
src/readingv-activity/Makefile
src/readingv-activity/activity/Makefile
src/redraw-activity/Makefile
src/redraw-activity/activity/Makefile
src/redraw_symmetrical-activity/Makefile
src/redraw_symmetrical-activity/activity/Makefile
src/reversecount-activity/Makefile
src/reversecount-activity/activity/Makefile
src/scalesboard-activity/Makefile
src/scalesboard-activity/activity/Makefile
src/searace-activity/Makefile
src/searace-activity/activity/Makefile
src/searace1player-activity/Makefile
src/searace1player-activity/activity/Makefile
src/smallnumbers-activity/Makefile
src/smallnumbers-activity/activity/Makefile
src/smallnumbers2-activity/Makefile
src/smallnumbers2-activity/activity/Makefile
src/submarine-activity/Makefile
src/submarine-activity/activity/Makefile
src/sudoku-activity/Makefile
src/sudoku-activity/activity/Makefile
src/sudoku-activity/resources/Makefile
src/superbrain-activity/Makefile
src/superbrain-activity/activity/Makefile
src/superbrain-activity/resources/Makefile
src/tangram-activity/Makefile
src/tangram-activity/activity/Makefile
src/target-activity/Makefile
src/target-activity/activity/Makefile
src/traffic-activity/Makefile
src/traffic-activity/activity/Makefile
src/tuxpaint-activity/Makefile
src/tuxpaint-activity/activity/Makefile
src/watercycle-activity/Makefile
src/watercycle-activity/activity/Makefile
src/wordprocessor-activity/Makefile
src/wordprocessor-activity/activity/Makefile
src/wordsgame-activity/Makefile
src/wordsgame-activity/activity/Makefile
src/anim-activity/activity/Makefile
src/anim-activity/Makefile
src/administration-activity/activity/Makefile
src/administration-activity/Makefile
src/administration-activity/admin/Makefile
src/algorithm-activity/activity/Makefile
src/algorithm-activity/Makefile
src/ballcatch-activity/activity/Makefile
src/ballcatch-activity/Makefile
src/bargame-activity/activity/Makefile
src/bargame-activity/Makefile
src/chat-activity/activity/Makefile
src/chat-activity/Makefile
src/clickanddraw-activity/activity/Makefile
src/clickanddraw-activity/Makefile
src/connect4-2players-activity/activity/Makefile
src/connect4-2players-activity/Makefile
src/connect4-activity/activity/Makefile
src/connect4-activity/Makefile
src/drawnumber-activity/activity/Makefile
src/drawnumber-activity/Makefile
src/draw-activity/activity/Makefile
src/draw-activity/Makefile
src/electric-activity/activity/Makefile
src/electric-activity/Makefile
src/followline-activity/activity/Makefile
src/followline-activity/Makefile
src/gnumch-equality-activity/activity/Makefile
src/gnumch-equality-activity/Makefile
src/gnumch-factors-activity/activity/Makefile
src/gnumch-factors-activity/Makefile
src/gnumch-inequality-activity/activity/Makefile
src/gnumch-inequality-activity/Makefile
src/gnumch-multiples-activity/activity/Makefile
src/gnumch-multiples-activity/Makefile
src/gnumch-primes-activity/activity/Makefile
src/gnumch-primes-activity/Makefile
src/guessnumber-activity/activity/Makefile
src/guessnumber-activity/Makefile
src/hexagon-activity/activity/Makefile
src/hexagon-activity/Makefile
src/login-activity/activity/Makefile
src/login-activity/Makefile
src/melody-activity/activity/Makefile
src/melody-activity/Makefile
src/mosaic-activity/activity/Makefile
src/mosaic-activity/Makefile
src/pythontemplate-activity/activity/Makefile
src/pythontemplate-activity/Makefile
src/pythontest-activity/activity/Makefile
src/pythontest-activity/Makefile
src/redraw_symmetrical-activity/activity/Makefile
src/redraw_symmetrical-activity/Makefile
src/redraw-activity/activity/Makefile
src/redraw-activity/Makefile
src/searace1player-activity/activity/Makefile
src/searace1player-activity/Makefile
src/searace-activity/activity/Makefile
src/searace-activity/Makefile
src/sudoku-activity/activity/Makefile
src/sudoku-activity/Makefile
src/tuxpaint-activity/activity/Makefile
src/tuxpaint-activity/Makefile
src/watercycle-activity/activity/Makefile
src/watercycle-activity/Makefile
src/writing_tutor_image_match-activity/activity/Makefile
src/writing_tutor_image_match-activity/DTW/Makefile
src/writing_tutor_image_match-activity/Makefile
src/writing_tutor_missing_match-activity/activity/Makefile
src/writing_tutor_image_match-activity/activity/Makefile
src/writing_tutor_missing_match-activity/Makefile
src/writing_tutor_pattern_admin-activity/activity/Makefile
src/writing_tutor_missing_match-activity/activity/Makefile
src/writing_tutor_pattern_admin-activity/Makefile
src/writing_tutor_template_match-activity/activity/Makefile
src/writing_tutor_pattern_admin-activity/activity/Makefile
src/writing_tutor_template_match-activity/Makefile
src/writing_tutor_template_match-activity/activity/Makefile
])
echo ""
......
......@@ -145,8 +145,6 @@ static void start_board (GcomprisBoard *agcomprisBoard)
if(agcomprisBoard!=NULL)
{
gchar *img;
gcomprisBoard=agcomprisBoard;
gcomprisBoard->level=1;
gcomprisBoard->maxlevel=8;
......@@ -168,10 +166,8 @@ static void start_board (GcomprisBoard *agcomprisBoard)
gc_bar_set(GC_BAR_LEVEL|GC_BAR_REPEAT);
}
img = gc_skin_image_get("traffic-bg.jpg");
gc_set_background(gnome_canvas_root(gcomprisBoard->canvas),
img);
g_free(img);
"traffic/traffic-bg.jpg");
traffic_next_level();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment