gcompris r3251 - in branches/gcomprixogoo: . src/administration-activity src/administration-activity/admin src/advanced_colors-activity src/algebra_by-activity src/algebra_guesscount-activity src/algorithm-activity src/anim-activity src/awele-activity src/ballcatch-activity src/bargame-activity src/billard-activity src/boards src/canal_lock-activity src/chat-activity src/chess_computer-activity src/click_on_letter-activity src/clickgame-activity src/clockgame-activity src/colors-activity src/connect4-activity src/connect4-activity/connect4p src/crane-activity src/drawnumber-activity src/electric-activity src/enumerate-activity src/erase-activity src/fifteen-activity src/followline-activity src/gcompris src/gletters-activity src/gnumch-equality-activity src/guessnumber-activity src/hanoi-activity src/hanoi_real-activity src/hexagon-activity src/imageid-activity src/leftright-activity src/login-activity src/magic_hat_minus-activity src/maze-activity src/melody-activity src/memory-activity src/missing_letter-activity src/money-activity src/mosaic-activity src/paratrooper-activity src/planegame-activity src/pythontemplate-activity src/pythontest-activity src/railroad-activity src/read_colors-activity src/readingh-activity src/redraw-activity src/reversecount-activity src/scalesboard-activity src/searace-activity src/smallnumbers-activity src/submarine-activity src/sudoku-activity src/superbrain-activity src/tangram-activity src/target-activity src/traffic-activity src/tuxpaint-activity src/wordprocessor-activity src/wordsgame-activity
- From: bcoudoin svn gnome org
- To: svn-commits-list gnome org
- Subject: gcompris r3251 - in branches/gcomprixogoo: . src/administration-activity src/administration-activity/admin src/advanced_colors-activity src/algebra_by-activity src/algebra_guesscount-activity src/algorithm-activity src/anim-activity src/awele-activity src/ballcatch-activity src/bargame-activity src/billard-activity src/boards src/canal_lock-activity src/chat-activity src/chess_computer-activity src/click_on_letter-activity src/clickgame-activity src/clockgame-activity src/colors-activity src/connect4-activity src/connect4-activity/connect4p src/crane-activity src/drawnumber-activity src/electric-activity src/enumerate-activity src/erase-activity src/fifteen-activity src/followline-activity src/gcompris src/gletters-activity src/gnumch-equality-activity src/guessnumber-activity src/hanoi-activity src/hanoi_real-activity src/hexagon-activity src/imageid-activity src/leftright-activity src/login-activity src/magic_hat_minus-activity src/maze-activity src/melody-activity src/memory-activity src/missing_letter-activity src/money-activity src/mosaic-activity src/paratrooper-activity src/planegame-activity src/pythontemplate-activity src/pythontest-activity src/railroad-activity src/read_colors-activity src/readingh-activity src/redraw-activity src/reversecount-activity src/scalesboard-activity src/searace-activity src/smallnumbers-activity src/submarine-activity src/sudoku-activity src/superbrain-activity src/tangram-activity src/target-activity src/traffic-activity src/tuxpaint-activity src/wordprocessor-activity src/wordsgame-activity
- Date: Sat, 16 Feb 2008 00:12:34 +0000 (GMT)
Author: bcoudoin
Date: Sat Feb 16 00:12:31 2008
New Revision: 3251
URL: http://svn.gnome.org/viewvc/gcompris?rev=3251&view=rev
Log:
Updated licence, now this branch is like trunk, GPL V3 and above
Modified:
branches/gcomprixogoo/ChangeLog
branches/gcomprixogoo/src/administration-activity/admin/board_list.py
branches/gcomprixogoo/src/administration-activity/admin/class_edit.py
branches/gcomprixogoo/src/administration-activity/admin/class_list.py
branches/gcomprixogoo/src/administration-activity/admin/constants.py
branches/gcomprixogoo/src/administration-activity/admin/group_edit.py
branches/gcomprixogoo/src/administration-activity/admin/group_list.py
branches/gcomprixogoo/src/administration-activity/admin/group_user_list.py
branches/gcomprixogoo/src/administration-activity/admin/log_list.py
branches/gcomprixogoo/src/administration-activity/admin/module.py
branches/gcomprixogoo/src/administration-activity/admin/module_boards.py
branches/gcomprixogoo/src/administration-activity/admin/module_groups.py
branches/gcomprixogoo/src/administration-activity/admin/module_profiles.py
branches/gcomprixogoo/src/administration-activity/admin/module_reports.py
branches/gcomprixogoo/src/administration-activity/admin/module_users.py
branches/gcomprixogoo/src/administration-activity/admin/profile_edit.py
branches/gcomprixogoo/src/administration-activity/admin/profile_group_list.py
branches/gcomprixogoo/src/administration-activity/admin/profile_list.py
branches/gcomprixogoo/src/administration-activity/admin/user_edit.py
branches/gcomprixogoo/src/administration-activity/admin/user_list.py
branches/gcomprixogoo/src/administration-activity/admin/wordlist.py
branches/gcomprixogoo/src/administration-activity/administration.py
branches/gcomprixogoo/src/advanced_colors-activity/advanced_colors.c
branches/gcomprixogoo/src/algebra_by-activity/algebra.c
branches/gcomprixogoo/src/algebra_guesscount-activity/algebra_guesscount.c
branches/gcomprixogoo/src/algorithm-activity/algorithm.py
branches/gcomprixogoo/src/anim-activity/anim.py
branches/gcomprixogoo/src/awele-activity/awele.c
branches/gcomprixogoo/src/awele-activity/awele.h
branches/gcomprixogoo/src/awele-activity/awele_alphaBeta.c
branches/gcomprixogoo/src/awele-activity/awele_utils.c
branches/gcomprixogoo/src/awele-activity/awele_utils.h
branches/gcomprixogoo/src/ballcatch-activity/ballcatch.py
branches/gcomprixogoo/src/bargame-activity/bargame.py
branches/gcomprixogoo/src/billard-activity/billard.c
branches/gcomprixogoo/src/boards/menu2.c
branches/gcomprixogoo/src/boards/py-gcompris-board.c
branches/gcomprixogoo/src/boards/py-gcompris-board.h
branches/gcomprixogoo/src/boards/py-gcompris-class.c
branches/gcomprixogoo/src/boards/py-gcompris-group.c
branches/gcomprixogoo/src/boards/py-gcompris-profile.c
branches/gcomprixogoo/src/boards/py-gcompris-profile.h
branches/gcomprixogoo/src/boards/py-gcompris-properties.c
branches/gcomprixogoo/src/boards/py-gcompris-properties.h
branches/gcomprixogoo/src/boards/py-gcompris-user.c
branches/gcomprixogoo/src/boards/py-gcompris-wordlist.c
branches/gcomprixogoo/src/boards/py-gcompris-wordlist.h
branches/gcomprixogoo/src/boards/py-mod-admin.c
branches/gcomprixogoo/src/boards/py-mod-admin.h
branches/gcomprixogoo/src/boards/py-mod-anim.c
branches/gcomprixogoo/src/boards/py-mod-anim.h
branches/gcomprixogoo/src/boards/py-mod-bonus.c
branches/gcomprixogoo/src/boards/py-mod-bonus.h
branches/gcomprixogoo/src/boards/py-mod-gcompris.c
branches/gcomprixogoo/src/boards/py-mod-gcompris.h
branches/gcomprixogoo/src/boards/py-mod-score.c
branches/gcomprixogoo/src/boards/py-mod-score.h
branches/gcomprixogoo/src/boards/py-mod-skin.c
branches/gcomprixogoo/src/boards/py-mod-skin.h
branches/gcomprixogoo/src/boards/py-mod-sound.c
branches/gcomprixogoo/src/boards/py-mod-sound.h
branches/gcomprixogoo/src/boards/py-mod-timer.c
branches/gcomprixogoo/src/boards/py-mod-timer.h
branches/gcomprixogoo/src/boards/py-mod-utils.c
branches/gcomprixogoo/src/boards/py-mod-utils.h
branches/gcomprixogoo/src/boards/python.c
branches/gcomprixogoo/src/canal_lock-activity/canal_lock.c
branches/gcomprixogoo/src/chat-activity/chat.py
branches/gcomprixogoo/src/chess_computer-activity/chess.c
branches/gcomprixogoo/src/chess_computer-activity/chess_makros.h
branches/gcomprixogoo/src/chess_computer-activity/chess_notation.c
branches/gcomprixogoo/src/chess_computer-activity/chess_notation.h
branches/gcomprixogoo/src/chess_computer-activity/chess_position.c
branches/gcomprixogoo/src/chess_computer-activity/chess_position.h
branches/gcomprixogoo/src/click_on_letter-activity/click_on_letter.c
branches/gcomprixogoo/src/clickgame-activity/clickgame.c
branches/gcomprixogoo/src/clockgame-activity/clockgame.c
branches/gcomprixogoo/src/colors-activity/colors.c
branches/gcomprixogoo/src/connect4-activity/connect4.py
branches/gcomprixogoo/src/connect4-activity/connect4p/board.py
branches/gcomprixogoo/src/connect4-activity/connect4p/human.py
branches/gcomprixogoo/src/connect4-activity/connect4p/minmax.py
branches/gcomprixogoo/src/connect4-activity/connect4p/player.py
branches/gcomprixogoo/src/connect4-activity/connect4p/rules.py
branches/gcomprixogoo/src/crane-activity/crane.c
branches/gcomprixogoo/src/drawnumber-activity/clickanddraw.py
branches/gcomprixogoo/src/drawnumber-activity/drawnumber.py
branches/gcomprixogoo/src/electric-activity/electric.py
branches/gcomprixogoo/src/enumerate-activity/enumerate.c
branches/gcomprixogoo/src/erase-activity/erase.c
branches/gcomprixogoo/src/fifteen-activity/fifteen.c
branches/gcomprixogoo/src/followline-activity/followline.py
branches/gcomprixogoo/src/gcompris/about.c
branches/gcomprixogoo/src/gcompris/about.h
branches/gcomprixogoo/src/gcompris/anim.c
branches/gcomprixogoo/src/gcompris/anim.h
branches/gcomprixogoo/src/gcompris/bar.c
branches/gcomprixogoo/src/gcompris/board.c
branches/gcomprixogoo/src/gcompris/board.h
branches/gcomprixogoo/src/gcompris/board_config.c
branches/gcomprixogoo/src/gcompris/board_config.h
branches/gcomprixogoo/src/gcompris/bonus.c
branches/gcomprixogoo/src/gcompris/bonus.h
branches/gcomprixogoo/src/gcompris/cache.c
branches/gcomprixogoo/src/gcompris/config.c
branches/gcomprixogoo/src/gcompris/dbus.c
branches/gcomprixogoo/src/gcompris/dialog.c
branches/gcomprixogoo/src/gcompris/drag.c
branches/gcomprixogoo/src/gcompris/drag.h
branches/gcomprixogoo/src/gcompris/file_selector.c
branches/gcomprixogoo/src/gcompris/gameutil.c
branches/gcomprixogoo/src/gcompris/gameutil.h
branches/gcomprixogoo/src/gcompris/gc_core.h
branches/gcomprixogoo/src/gcompris/gc_net.c
branches/gcomprixogoo/src/gcompris/gc_net.h
branches/gcomprixogoo/src/gcompris/gcompris-board.h
branches/gcomprixogoo/src/gcompris/gcompris.c
branches/gcomprixogoo/src/gcompris/gcompris.h
branches/gcomprixogoo/src/gcompris/gcompris_alphabeta.c
branches/gcomprixogoo/src/gcompris/gcompris_alphabeta.h
branches/gcomprixogoo/src/gcompris/gcompris_config.h
branches/gcomprixogoo/src/gcompris/gcompris_confirm.c
branches/gcomprixogoo/src/gcompris/gcompris_db.c
branches/gcomprixogoo/src/gcompris/gcompris_db.h
branches/gcomprixogoo/src/gcompris/gcompris_im.c
branches/gcomprixogoo/src/gcompris/gcompris_im.h
branches/gcomprixogoo/src/gcompris/help.c
branches/gcomprixogoo/src/gcompris/images_selector.c
branches/gcomprixogoo/src/gcompris/log.c
branches/gcomprixogoo/src/gcompris/menu.c
branches/gcomprixogoo/src/gcompris/pixbuf_util.c
branches/gcomprixogoo/src/gcompris/pixbuf_util.h
branches/gcomprixogoo/src/gcompris/plugin.h
branches/gcomprixogoo/src/gcompris/profile.c
branches/gcomprixogoo/src/gcompris/profile.h
branches/gcomprixogoo/src/gcompris/properties.c
branches/gcomprixogoo/src/gcompris/properties.h
branches/gcomprixogoo/src/gcompris/score.c
branches/gcomprixogoo/src/gcompris/score.h
branches/gcomprixogoo/src/gcompris/skin.c
branches/gcomprixogoo/src/gcompris/skin.h
branches/gcomprixogoo/src/gcompris/soundutil.c
branches/gcomprixogoo/src/gcompris/soundutil.h
branches/gcomprixogoo/src/gcompris/timer.c
branches/gcomprixogoo/src/gcompris/timer.h
branches/gcomprixogoo/src/gcompris/wordlist.c
branches/gcomprixogoo/src/gcompris/wordlist.h
branches/gcomprixogoo/src/gletters-activity/gletters.c
branches/gcomprixogoo/src/gnumch-equality-activity/gnumch.py
branches/gcomprixogoo/src/guessnumber-activity/guessnumber.py
branches/gcomprixogoo/src/hanoi-activity/hanoi.c
branches/gcomprixogoo/src/hanoi_real-activity/hanoi_real.c
branches/gcomprixogoo/src/hexagon-activity/hexagon.py
branches/gcomprixogoo/src/imageid-activity/imageid.c
branches/gcomprixogoo/src/leftright-activity/leftright.c
branches/gcomprixogoo/src/login-activity/login.py
branches/gcomprixogoo/src/magic_hat_minus-activity/magic_hat.c
branches/gcomprixogoo/src/maze-activity/maze.c
branches/gcomprixogoo/src/melody-activity/melody.py
branches/gcomprixogoo/src/memory-activity/memory.c
branches/gcomprixogoo/src/missing_letter-activity/missingletter.c
branches/gcomprixogoo/src/money-activity/money.c
branches/gcomprixogoo/src/money-activity/money_widget.c
branches/gcomprixogoo/src/money-activity/money_widget.h
branches/gcomprixogoo/src/mosaic-activity/mosaic.py
branches/gcomprixogoo/src/paratrooper-activity/paratrooper.c
branches/gcomprixogoo/src/planegame-activity/planegame.c
branches/gcomprixogoo/src/pythontemplate-activity/pythontemplate.py
branches/gcomprixogoo/src/pythontest-activity/pythontest.py
branches/gcomprixogoo/src/railroad-activity/railroad.c
branches/gcomprixogoo/src/read_colors-activity/read_colors.c
branches/gcomprixogoo/src/readingh-activity/reading.c
branches/gcomprixogoo/src/redraw-activity/redraw.py
branches/gcomprixogoo/src/reversecount-activity/reversecount.c
branches/gcomprixogoo/src/scalesboard-activity/scale.c
branches/gcomprixogoo/src/searace-activity/searace.py
branches/gcomprixogoo/src/smallnumbers-activity/smallnumbers.c
branches/gcomprixogoo/src/submarine-activity/submarine.c
branches/gcomprixogoo/src/sudoku-activity/sudoku.py
branches/gcomprixogoo/src/superbrain-activity/superbrain.c
branches/gcomprixogoo/src/tangram-activity/gtans.c
branches/gcomprixogoo/src/tangram-activity/gtans_callbacks.c
branches/gcomprixogoo/src/target-activity/target.c
branches/gcomprixogoo/src/traffic-activity/traffic.c
branches/gcomprixogoo/src/traffic-activity/traffic.h
branches/gcomprixogoo/src/tuxpaint-activity/tuxpaint.py
branches/gcomprixogoo/src/wordprocessor-activity/wordprocessor.c
branches/gcomprixogoo/src/wordsgame-activity/wordsgame.c
Modified: branches/gcomprixogoo/src/administration-activity/admin/board_list.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/board_list.py (original)
+++ branches/gcomprixogoo/src/administration-activity/admin/board_list.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
import goocanvas
Modified: branches/gcomprixogoo/src/administration-activity/admin/class_edit.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/class_edit.py (original)
+++ branches/gcomprixogoo/src/administration-activity/admin/class_edit.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
Modified: branches/gcomprixogoo/src/administration-activity/admin/class_list.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/class_list.py (original)
+++ branches/gcomprixogoo/src/administration-activity/admin/class_list.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
import goocanvas
Modified: branches/gcomprixogoo/src/administration-activity/admin/constants.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/constants.py (original)
+++ branches/gcomprixogoo/src/administration-activity/admin/constants.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,9 +13,8 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+
# Some common constants for the administration
Modified: branches/gcomprixogoo/src/administration-activity/admin/group_edit.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/group_edit.py (original)
+++ branches/gcomprixogoo/src/administration-activity/admin/group_edit.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
Modified: branches/gcomprixogoo/src/administration-activity/admin/group_list.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/group_list.py (original)
+++ branches/gcomprixogoo/src/administration-activity/admin/group_list.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
import goocanvas
Modified: branches/gcomprixogoo/src/administration-activity/admin/group_user_list.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/group_user_list.py (original)
+++ branches/gcomprixogoo/src/administration-activity/admin/group_user_list.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
import goocanvas
Modified: branches/gcomprixogoo/src/administration-activity/admin/log_list.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/log_list.py (original)
+++ branches/gcomprixogoo/src/administration-activity/admin/log_list.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
import goocanvas
Modified: branches/gcomprixogoo/src/administration-activity/admin/module.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/module.py (original)
+++ branches/gcomprixogoo/src/administration-activity/admin/module.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# This is the base Class for all Administration modules.
Modified: branches/gcomprixogoo/src/administration-activity/admin/module_boards.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/module_boards.py (original)
+++ branches/gcomprixogoo/src/administration-activity/admin/module_boards.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
import goocanvas
Modified: branches/gcomprixogoo/src/administration-activity/admin/module_groups.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/module_groups.py (original)
+++ branches/gcomprixogoo/src/administration-activity/admin/module_groups.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
import goocanvas
Modified: branches/gcomprixogoo/src/administration-activity/admin/module_profiles.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/module_profiles.py (original)
+++ branches/gcomprixogoo/src/administration-activity/admin/module_profiles.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+
#
import goocanvas
Modified: branches/gcomprixogoo/src/administration-activity/admin/module_reports.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/module_reports.py (original)
+++ branches/gcomprixogoo/src/administration-activity/admin/module_reports.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
import goocanvas
Modified: branches/gcomprixogoo/src/administration-activity/admin/module_users.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/module_users.py (original)
+++ branches/gcomprixogoo/src/administration-activity/admin/module_users.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
import goocanvas
Modified: branches/gcomprixogoo/src/administration-activity/admin/profile_edit.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/profile_edit.py (original)
+++ branches/gcomprixogoo/src/administration-activity/admin/profile_edit.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
Modified: branches/gcomprixogoo/src/administration-activity/admin/profile_group_list.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/profile_group_list.py (original)
+++ branches/gcomprixogoo/src/administration-activity/admin/profile_group_list.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
import goocanvas
Modified: branches/gcomprixogoo/src/administration-activity/admin/profile_list.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/profile_list.py (original)
+++ branches/gcomprixogoo/src/administration-activity/admin/profile_list.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
import goocanvas
Modified: branches/gcomprixogoo/src/administration-activity/admin/user_edit.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/user_edit.py (original)
+++ branches/gcomprixogoo/src/administration-activity/admin/user_edit.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
Modified: branches/gcomprixogoo/src/administration-activity/admin/user_list.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/user_list.py (original)
+++ branches/gcomprixogoo/src/administration-activity/admin/user_list.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
import gcompris
Modified: branches/gcomprixogoo/src/administration-activity/admin/wordlist.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/admin/wordlist.py (original)
+++ branches/gcomprixogoo/src/administration-activity/admin/wordlist.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
import goocanvas
Modified: branches/gcomprixogoo/src/administration-activity/administration.py
==============================================================================
--- branches/gcomprixogoo/src/administration-activity/administration.py (original)
+++ branches/gcomprixogoo/src/administration-activity/administration.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# Administration Board module
import goocanvas
Modified: branches/gcomprixogoo/src/advanced_colors-activity/advanced_colors.c
==============================================================================
--- branches/gcomprixogoo/src/advanced_colors-activity/advanced_colors.c (original)
+++ branches/gcomprixogoo/src/advanced_colors-activity/advanced_colors.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <string.h>
Modified: branches/gcomprixogoo/src/algebra_by-activity/algebra.c
==============================================================================
--- branches/gcomprixogoo/src/algebra_by-activity/algebra.c (original)
+++ branches/gcomprixogoo/src/algebra_by-activity/algebra.c Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
/* gcompris - algebra.c
*
- * Time-stamp: <2006/08/21 23:29:57 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <ctype.h>
Modified: branches/gcomprixogoo/src/algebra_guesscount-activity/algebra_guesscount.c
==============================================================================
--- branches/gcomprixogoo/src/algebra_guesscount-activity/algebra_guesscount.c (original)
+++ branches/gcomprixogoo/src/algebra_guesscount-activity/algebra_guesscount.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "gcompris/gcompris.h"
Modified: branches/gcomprixogoo/src/algorithm-activity/algorithm.py
==============================================================================
--- branches/gcomprixogoo/src/algorithm-activity/algorithm.py (original)
+++ branches/gcomprixogoo/src/algorithm-activity/algorithm.py Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
# gcompris - algorithm
#
-# Time-stamp: <2004/29/03 15:31 Ingo Konrad>
-#
# Copyright (C) 2004 Christof Petig and Ingo Konrad
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
import goocanvas
import gcompris
Modified: branches/gcomprixogoo/src/anim-activity/anim.py
==============================================================================
--- branches/gcomprixogoo/src/anim-activity/anim.py (original)
+++ branches/gcomprixogoo/src/anim-activity/anim.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,9 +13,8 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+
# Version 2 of anim
# Due to performance, the animation code as been rewriten
Modified: branches/gcomprixogoo/src/awele-activity/awele.c
==============================================================================
--- branches/gcomprixogoo/src/awele-activity/awele.c (original)
+++ branches/gcomprixogoo/src/awele-activity/awele.c Sat Feb 16 00:12:31 2008
@@ -1,17 +1,20 @@
/*
* gcompris - awele.c
*
- * Copyright (C) 2005 Frederic Mazzarol This program is
- * free software; you can redistribute it and/or modify it under the terms
- * of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any
- * later version. This program is distributed in the hope that it will
- * be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details. You should have received a
- * copy of the GNU General Public License along with this program; if not,
- * write to the Free Software Foundation, Inc., 59 Temple Place, Suite
- * 330, Boston, MA 02111-1307 USA
+ * Copyright (C) 2005 Frederic Mazzarol
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "gcompris/gcompris.h"
Modified: branches/gcomprixogoo/src/awele-activity/awele.h
==============================================================================
--- branches/gcomprixogoo/src/awele-activity/awele.h (original)
+++ branches/gcomprixogoo/src/awele-activity/awele.h Sat Feb 16 00:12:31 2008
@@ -1,15 +1,18 @@
/*
- * gcompris - awele.h Copyright (C) 2005 Frederic Mazzarol This program is
- * free software; you can redistribute it and/or modify it under the terms
- * of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any
- * later version. This program is distributed in the hope that it will
- * be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details. You should have received a
- * copy of the GNU General Public License along with this program; if not,
- * write to the Free Software Foundation, Inc., 59 Temple Place, Suite
- * 330, Boston, MA 02111-1307 USA
+ * gcompris - awele.h Copyright (C) 2005 Frederic Mazzarol
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
Modified: branches/gcomprixogoo/src/awele-activity/awele_alphaBeta.c
==============================================================================
--- branches/gcomprixogoo/src/awele-activity/awele_alphaBeta.c (original)
+++ branches/gcomprixogoo/src/awele-activity/awele_alphaBeta.c Sat Feb 16 00:12:31 2008
@@ -1,15 +1,19 @@
/*
- * gcompris - awele.c Copyright (C) 2005 Frederic Mazzarol This program is
- * free software; you can redistribute it and/or modify it under the terms
- * of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any
- * later version. This program is distributed in the hope that it will
- * be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details. You should have received a
- * copy of the GNU General Public License along with this program; if not,
- * write to the Free Software Foundation, Inc., 59 Temple Place, Suite
- * 330, Boston, MA 02111-1307 USA
+ * gcompris - awele.c
+ * Copyright (C) 2005 Frederic Mazzarol
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "awele_utils.h"
@@ -42,7 +46,7 @@
/*
* Evaluation function for level 1-2
- * this function returns always 0. The play is random,
+ * this function returns always 0. The play is random,
* because tree building is randomised.
*
*/
@@ -83,7 +87,7 @@
g_node_insert (node, -1, tmpnode);
}
}
-
+
return g_node_first_child(node);
}
@@ -163,28 +167,28 @@
break;
}
- value = gc_alphabeta( TRUE,
- t,
- use_eval,
- &best,
- (FirstChildGameFunction) firstChild,
+ value = gc_alphabeta( TRUE,
+ t,
+ use_eval,
+ &best,
+ (FirstChildGameFunction) firstChild,
(NextSiblingGameFunction) nextSibling,
- -INFINI ,
+ -INFINI ,
INFINI,
maxprof) ;
-
+
if (best < 0){
g_warning("Leaf node, game is over");
return -1;
}
GNode *tmpNode = g_node_nth_child (t, best);
-
+
AWALE *tmpaw = tmpNode->data;
-
+
g_warning("THINK best : %d, play: %d", value, tmpaw->last_play);
-
+
best = tmpaw->last_play;
-
+
/* free awales*/
g_node_traverse (t,
G_IN_ORDER,
Modified: branches/gcomprixogoo/src/awele-activity/awele_utils.c
==============================================================================
--- branches/gcomprixogoo/src/awele-activity/awele_utils.c (original)
+++ branches/gcomprixogoo/src/awele-activity/awele_utils.c Sat Feb 16 00:12:31 2008
@@ -1,15 +1,20 @@
/*
- * gcompris - awele.c Copyright (C) 2005 Frederic Mazzarol This program is
- * free software; you can redistribute it and/or modify it under the terms
- * of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any
- * later version. This program is distributed in the hope that it will
- * be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details. You should have received a
- * copy of the GNU General Public License along with this program; if not,
- * write to the Free Software Foundation, Inc., 59 Temple Place, Suite
- * 330, Boston, MA 02111-1307 USA
+ * gcompris - awele.c
+ *
+ * Copyright (C) 2005 Frederic Mazzarol
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "awele_utils.h"
@@ -59,16 +64,16 @@
}
short int nbBeans, j, last;
-
+
tempAw = g_malloc(sizeof(AWALE));
-
+
memcpy(tempAw, aw, sizeof(AWALE));
tempAw->last_play = hole;
nbBeans = tempAw->board[hole];
tempAw->board[hole] = 0;
-
+
// DÃplacement des graines
for (j = 1, last = (hole+1)%12 ; j <= nbBeans; j++) {
tempAw->board[last] += 1;
@@ -109,7 +114,7 @@
g_free(tempAwGs);
return NULL;
}
- }
+ }
else {
tempAw->player = switch_player(tempAw->player);
return tempAw;
Modified: branches/gcomprixogoo/src/awele-activity/awele_utils.h
==============================================================================
--- branches/gcomprixogoo/src/awele-activity/awele_utils.h (original)
+++ branches/gcomprixogoo/src/awele-activity/awele_utils.h Sat Feb 16 00:12:31 2008
@@ -1,15 +1,18 @@
/*
- * gcompris - awele.c Copyright (C) 2005 Frederic Mazzarol This program is
- * free software; you can redistribute it and/or modify it under the terms
- * of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License, or (at your option) any
- * later version. This program is distributed in the hope that it will
- * be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details. You should have received a
- * copy of the GNU General Public License along with this program; if not,
- * write to the Free Software Foundation, Inc., 59 Temple Place, Suite
- * 330, Boston, MA 02111-1307 USA
+ * gcompris - awele.c Copyright (C) 2005 Frederic Mazzarol
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "gcompris/gcompris.h"
Modified: branches/gcomprixogoo/src/ballcatch-activity/ballcatch.py
==============================================================================
--- branches/gcomprixogoo/src/ballcatch-activity/ballcatch.py (original)
+++ branches/gcomprixogoo/src/ballcatch-activity/ballcatch.py Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+# gcompris - ballcatch.py
+#
+# Copyright (C) 2003 Bruno Coudoin
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
# Ballcatch Board module
import gobject
import goocanvas
Modified: branches/gcomprixogoo/src/bargame-activity/bargame.py
==============================================================================
--- branches/gcomprixogoo/src/bargame-activity/bargame.py (original)
+++ branches/gcomprixogoo/src/bargame-activity/bargame.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
import goocanvas
import gcompris
Modified: branches/gcomprixogoo/src/billard-activity/billard.c
==============================================================================
--- branches/gcomprixogoo/src/billard-activity/billard.c (original)
+++ branches/gcomprixogoo/src/billard-activity/billard.c Sat Feb 16 00:12:31 2008
@@ -1,10 +1,10 @@
-/* gcompris - minigolf.c
+/* gcompris - billard.c
*
* Copyright (C) 2001 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "gcompris/gcompris.h"
@@ -242,7 +241,7 @@
create_machine_item(MACH_HOLE, 750.0, 260.0);
- create_machine_item(MACH_BASKET_BALL,
+ create_machine_item(MACH_BASKET_BALL,
(double)g_random_int_range(60, 150),
(double)RAND(60, 400));
@@ -290,11 +289,11 @@
gc_sound_play_ogg ("sounds/scroll.wav", NULL);
width = bounds.x2 - bounds.x1;
-
+
machItem->times = 0;
machItem->yposo = machItem->ypos;
machItem->xposo = machItem->xpos;
-
+
machItem->vyo = ((item_y-bounds.y1)<width/2?(width/2-(item_y-bounds.y1))*20:-1*(width/2-(bounds.y2-item_y))*20);
machItem->vxo = ((item_x-bounds.x1)<width/2?(width/2-(item_x-bounds.x1))*20:-1*(width/2-(bounds.x2-item_x))*20);
@@ -611,7 +610,7 @@
gc_item_absolute_move(item, machItem->xpos, machItem->ypos);
- if((machItem->ypos>=MIN_Y2-machItem->height-BORDER
+ if((machItem->ypos>=MIN_Y2-machItem->height-BORDER
&& (bounds.y1 - machItem->ypos)<=0) || collision == TRUE)
{
machItem->vyo = machItem->vyo * -0.5;
@@ -625,7 +624,7 @@
gc_sound_play_ogg ("sounds/line_end.wav", NULL);
}
- if((bounds.y1<=MIN_Y1 && (bounds.y1 - machItem->ypos)>=0)
+ if((bounds.y1<=MIN_Y1 && (bounds.y1 - machItem->ypos)>=0)
|| collision == TRUE)
{
machItem->vyo = machItem->vyo * -0.5;
Modified: branches/gcomprixogoo/src/boards/menu2.c
==============================================================================
--- branches/gcomprixogoo/src/boards/menu2.c (original)
+++ branches/gcomprixogoo/src/boards/menu2.c Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
/* gcompris - menu2.c
*
- * Time-stamp: <2007-04-15 21:19:36 bruno>
- *
- * Copyright (C) 2000 Bruno Coudoin
+ * Copyright (C) 2000 Bruno Coudoin, Yves Combe
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
/**
Modified: branches/gcomprixogoo/src/boards/py-gcompris-board.c
==============================================================================
--- branches/gcomprixogoo/src/boards/py-gcompris-board.c (original)
+++ branches/gcomprixogoo/src/boards/py-gcompris-board.c Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-mod-gcompris.c
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#include "py-gcompris-board.h"
#define NO_IMPORT_PYGOBJECT 1
#include <pygobject.h>
Modified: branches/gcomprixogoo/src/boards/py-gcompris-board.h
==============================================================================
--- branches/gcomprixogoo/src/boards/py-gcompris-board.h (original)
+++ branches/gcomprixogoo/src/boards/py-gcompris-board.h Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-gcompris-board.h
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#ifndef _PY_GCOMPRIS_BOARD_H_
#define _PY_GCOMPRIS_BOARD_H_
Modified: branches/gcomprixogoo/src/boards/py-gcompris-class.c
==============================================================================
--- branches/gcomprixogoo/src/boards/py-gcompris-class.c (original)
+++ branches/gcomprixogoo/src/boards/py-gcompris-class.c Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-mod-gcompris.c
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#include "py-gcompris-profile.h"
#define NO_IMPORT_PYGOBJECT 1
#include <pygobject.h>
Modified: branches/gcomprixogoo/src/boards/py-gcompris-group.c
==============================================================================
--- branches/gcomprixogoo/src/boards/py-gcompris-group.c (original)
+++ branches/gcomprixogoo/src/boards/py-gcompris-group.c Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-mod-gcompris.c
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#include "py-gcompris-profile.h"
#define NO_IMPORT_PYGOBJECT 1
#include <pygobject.h>
Modified: branches/gcomprixogoo/src/boards/py-gcompris-profile.c
==============================================================================
--- branches/gcomprixogoo/src/boards/py-gcompris-profile.c (original)
+++ branches/gcomprixogoo/src/boards/py-gcompris-profile.c Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-mod-gcompris.c
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#include "py-gcompris-profile.h"
#define NO_IMPORT_PYGOBJECT 1
#include <pygobject.h>
Modified: branches/gcomprixogoo/src/boards/py-gcompris-profile.h
==============================================================================
--- branches/gcomprixogoo/src/boards/py-gcompris-profile.h (original)
+++ branches/gcomprixogoo/src/boards/py-gcompris-profile.h Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-gcompris-profile.h
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#ifndef _PY_GCOMPRIS_PROFILE_H_
#define _PY_GCOMPRIS_PROFILE_H_
Modified: branches/gcomprixogoo/src/boards/py-gcompris-properties.c
==============================================================================
--- branches/gcomprixogoo/src/boards/py-gcompris-properties.c (original)
+++ branches/gcomprixogoo/src/boards/py-gcompris-properties.c Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-mod-gcompris.c
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#include "py-gcompris-properties.h"
#define NO_IMPORT_PYGOBJECT 1
#include <pygobject.h>
Modified: branches/gcomprixogoo/src/boards/py-gcompris-properties.h
==============================================================================
--- branches/gcomprixogoo/src/boards/py-gcompris-properties.h (original)
+++ branches/gcomprixogoo/src/boards/py-gcompris-properties.h Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-mod-properties.h
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#ifndef _PY_GCOMPRIS_PROPERTIES_H_
#define _PY_GCOMPRIS_PROPERTIES_H_
Modified: branches/gcomprixogoo/src/boards/py-gcompris-user.c
==============================================================================
--- branches/gcomprixogoo/src/boards/py-gcompris-user.c (original)
+++ branches/gcomprixogoo/src/boards/py-gcompris-user.c Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-mod-gcompris.c
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#include "py-gcompris-profile.h"
#define NO_IMPORT_PYGOBJECT 1
#include <pygobject.h>
Modified: branches/gcomprixogoo/src/boards/py-gcompris-wordlist.c
==============================================================================
--- branches/gcomprixogoo/src/boards/py-gcompris-wordlist.c (original)
+++ branches/gcomprixogoo/src/boards/py-gcompris-wordlist.c Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-mod-gcompris.c
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#include "py-gcompris-wordlist.h"
#define NO_IMPORT_PYGOBJECT 1
#include <pygobject.h>
Modified: branches/gcomprixogoo/src/boards/py-gcompris-wordlist.h
==============================================================================
--- branches/gcomprixogoo/src/boards/py-gcompris-wordlist.h (original)
+++ branches/gcomprixogoo/src/boards/py-gcompris-wordlist.h Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-mod-wordlist.h
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#ifndef _PY_GCOMPRIS_WORDLIST_H_
#define _PY_GCOMPRIS_WORDLIST_H_
Modified: branches/gcomprixogoo/src/boards/py-mod-admin.c
==============================================================================
--- branches/gcomprixogoo/src/boards/py-mod-admin.c (original)
+++ branches/gcomprixogoo/src/boards/py-mod-admin.c Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-mod-gcompris.c
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#include <Python.h>
#define NO_IMPORT_PYGOBJECT 1
Modified: branches/gcomprixogoo/src/boards/py-mod-admin.h
==============================================================================
--- branches/gcomprixogoo/src/boards/py-mod-admin.h (original)
+++ branches/gcomprixogoo/src/boards/py-mod-admin.h Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-mod-admin.h
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#ifndef _PY_MOD_ADMIN_H_
#define _PY_MOD_ADMIN_H_
Modified: branches/gcomprixogoo/src/boards/py-mod-anim.c
==============================================================================
--- branches/gcomprixogoo/src/boards/py-mod-anim.c (original)
+++ branches/gcomprixogoo/src/boards/py-mod-anim.c Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-mod-gcompris.c
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#include <Python.h>
#define NO_IMPORT_PYGOBJECT 1
#include <pygobject.h>
Modified: branches/gcomprixogoo/src/boards/py-mod-anim.h
==============================================================================
--- branches/gcomprixogoo/src/boards/py-mod-anim.h (original)
+++ branches/gcomprixogoo/src/boards/py-mod-anim.h Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-mod-anim.h
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#ifndef _PY_MOD_ANIM_H_
#define _PY_MOD_ANIM_H_
Modified: branches/gcomprixogoo/src/boards/py-mod-bonus.c
==============================================================================
--- branches/gcomprixogoo/src/boards/py-mod-bonus.c (original)
+++ branches/gcomprixogoo/src/boards/py-mod-bonus.c Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-mod-gcompris.c
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#include <Python.h>
#define NO_IMPORT_PYGOBJECT 1
#include <pygobject.h>
Modified: branches/gcomprixogoo/src/boards/py-mod-bonus.h
==============================================================================
--- branches/gcomprixogoo/src/boards/py-mod-bonus.h (original)
+++ branches/gcomprixogoo/src/boards/py-mod-bonus.h Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-mod-bonus.h
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#ifndef _PY_MOD_BONUS_H_
#define _PY_MOD_BONUS_H_
Modified: branches/gcomprixogoo/src/boards/py-mod-gcompris.c
==============================================================================
--- branches/gcomprixogoo/src/boards/py-mod-gcompris.c (original)
+++ branches/gcomprixogoo/src/boards/py-mod-gcompris.c Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
/* gcompris - py-mod-gcompris.c
*
- * Time-stamp: <2006/08/21 23:36:37 bruno>
- *
* Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <Python.h>
Modified: branches/gcomprixogoo/src/boards/py-mod-gcompris.h
==============================================================================
--- branches/gcomprixogoo/src/boards/py-mod-gcompris.h (original)
+++ branches/gcomprixogoo/src/boards/py-mod-gcompris.h Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-mod-gcompris.h
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#ifndef _PY_MOD_GCOMPRIS_H_
#define _PY_MOD_GCOMPRIS_H_
Modified: branches/gcomprixogoo/src/boards/py-mod-score.c
==============================================================================
--- branches/gcomprixogoo/src/boards/py-mod-score.c (original)
+++ branches/gcomprixogoo/src/boards/py-mod-score.c Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-mod-gcompris.c
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#include <Python.h>
#define NO_IMPORT_PYGOBJECT 1
#include <pygobject.h>
@@ -82,8 +99,8 @@
module = Py_InitModule("_gcompris_score", PythonGcomprisScoreModule);
/* Misc constants */
- PyModule_AddIntConstant(module, "STYLE_NOTE", SCORESTYLE_NOTE );
- PyModule_AddIntConstant(module, "STYLE_LIFE", SCORESTYLE_LIFE );
+ PyModule_AddIntConstant(module, "STYLE_NOTE", SCORESTYLE_NOTE );
+ PyModule_AddIntConstant(module, "STYLE_LIFE", SCORESTYLE_LIFE );
}
/* Some usefull code parts ... */
Modified: branches/gcomprixogoo/src/boards/py-mod-score.h
==============================================================================
--- branches/gcomprixogoo/src/boards/py-mod-score.h (original)
+++ branches/gcomprixogoo/src/boards/py-mod-score.h Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-mod-score.h
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#ifndef _PY_MOD_score_H_
#define _PY_MOD_score_H_
Modified: branches/gcomprixogoo/src/boards/py-mod-skin.c
==============================================================================
--- branches/gcomprixogoo/src/boards/py-mod-skin.c (original)
+++ branches/gcomprixogoo/src/boards/py-mod-skin.c Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-mod-gcompris.c
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#include <Python.h>
#define NO_IMPORT_PYGOBJECT 1
#include <pygobject.h>
Modified: branches/gcomprixogoo/src/boards/py-mod-skin.h
==============================================================================
--- branches/gcomprixogoo/src/boards/py-mod-skin.h (original)
+++ branches/gcomprixogoo/src/boards/py-mod-skin.h Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-mod-skin.h
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#ifndef _PY_MOD_SKIN_H_
#define _PY_MOD_SKIN_H_
Modified: branches/gcomprixogoo/src/boards/py-mod-sound.c
==============================================================================
--- branches/gcomprixogoo/src/boards/py-mod-sound.c (original)
+++ branches/gcomprixogoo/src/boards/py-mod-sound.c Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-mod-sound.c
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#include <Python.h>
#define NO_IMPORT_PYGOBJECT 1
#include <pygobject.h>
Modified: branches/gcomprixogoo/src/boards/py-mod-sound.h
==============================================================================
--- branches/gcomprixogoo/src/boards/py-mod-sound.h (original)
+++ branches/gcomprixogoo/src/boards/py-mod-sound.h Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-mod-sound.h
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#ifndef _PY_MOD_SOUND_H_
#define _PY_MOD_SOUND_H_
Modified: branches/gcomprixogoo/src/boards/py-mod-timer.c
==============================================================================
--- branches/gcomprixogoo/src/boards/py-mod-timer.c (original)
+++ branches/gcomprixogoo/src/boards/py-mod-timer.c Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-mod-timer.c
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#include <Python.h>
#define NO_IMPORT_PYGOBJECT 1
#include <pygobject.h>
@@ -102,7 +119,7 @@
result = gc_timer_get_remaining();
/* Create and return the result */
- return Py_BuildValue("i", result);
+ return Py_BuildValue("i", result);
}
Modified: branches/gcomprixogoo/src/boards/py-mod-timer.h
==============================================================================
--- branches/gcomprixogoo/src/boards/py-mod-timer.h (original)
+++ branches/gcomprixogoo/src/boards/py-mod-timer.h Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-mod-timer.h
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#ifndef _PY_MOD_TIMER_H_
#define _PY_MOD_TIMER_H_
Modified: branches/gcomprixogoo/src/boards/py-mod-utils.c
==============================================================================
--- branches/gcomprixogoo/src/boards/py-mod-utils.c (original)
+++ branches/gcomprixogoo/src/boards/py-mod-utils.c Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-mod-utils.c
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#include <Python.h>
#define NO_IMPORT_PYGOBJECT 1
#include <pygobject.h>
Modified: branches/gcomprixogoo/src/boards/py-mod-utils.h
==============================================================================
--- branches/gcomprixogoo/src/boards/py-mod-utils.h (original)
+++ branches/gcomprixogoo/src/boards/py-mod-utils.h Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+/* gcompris - py-mod-utils.h
+ *
+ * Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
#ifndef _PY_MOD_UTILS_H_
#define _PY_MOD_UTILS_H_
Modified: branches/gcomprixogoo/src/boards/python.c
==============================================================================
--- branches/gcomprixogoo/src/boards/python.c (original)
+++ branches/gcomprixogoo/src/boards/python.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <Python.h>
Modified: branches/gcomprixogoo/src/canal_lock-activity/canal_lock.c
==============================================================================
--- branches/gcomprixogoo/src/canal_lock-activity/canal_lock.c (original)
+++ branches/gcomprixogoo/src/canal_lock-activity/canal_lock.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "gcompris/gcompris.h"
Modified: branches/gcomprixogoo/src/chat-activity/chat.py
==============================================================================
--- branches/gcomprixogoo/src/chat-activity/chat.py (original)
+++ branches/gcomprixogoo/src/chat-activity/chat.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
import goocanvas
import gcompris
Modified: branches/gcomprixogoo/src/chess_computer-activity/chess.c
==============================================================================
--- branches/gcomprixogoo/src/chess_computer-activity/chess.c (original)
+++ branches/gcomprixogoo/src/chess_computer-activity/chess.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <stdarg.h>
Modified: branches/gcomprixogoo/src/chess_computer-activity/chess_makros.h
==============================================================================
--- branches/gcomprixogoo/src/chess_computer-activity/chess_makros.h (original)
+++ branches/gcomprixogoo/src/chess_computer-activity/chess_makros.h Sat Feb 16 00:12:31 2008
@@ -1,19 +1,18 @@
-/*
+/*
* Copyright (C) 1999 Robert Wilhelm
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _MAKROS_H_
Modified: branches/gcomprixogoo/src/chess_computer-activity/chess_notation.c
==============================================================================
--- branches/gcomprixogoo/src/chess_computer-activity/chess_notation.c (original)
+++ branches/gcomprixogoo/src/chess_computer-activity/chess_notation.c Sat Feb 16 00:12:31 2008
@@ -1,19 +1,18 @@
-/*
+/*
* Copyright (C) 1999,2001 Robert Wilhelm
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <stdlib.h>
@@ -84,7 +83,7 @@
}
-static void
+static void
delete_x (char *str)
{
char *p = strchr (str, 'x');
@@ -94,7 +93,7 @@
p++;
}
-static void
+static void
delete_plus (char *str)
{
char *p = strchr (str, '+');
@@ -104,7 +103,7 @@
p++;
}
-static void
+static void
delete_ep (char *str)
{
char *p = strstr (str, "ep");
@@ -114,7 +113,7 @@
p++;
}
-static void
+static void
delete_equal (char *str)
{
char *p = strstr (str, "=");
@@ -124,7 +123,7 @@
p++;
}
-static void
+static void
delete_hash (char *str)
{
char *p = strstr (str, "#");
@@ -146,7 +145,7 @@
/* promotion */
a = to;
- if (from > E4)
+ if (from > E4)
a = (a & 7) + A8; /* white */
else
a = (a & 7) + A1; /* black */
@@ -207,7 +206,7 @@
return tolower(piece_to_ascii_full[i]);
g_assert_not_reached ();
-
+
return -1;
}
@@ -242,9 +241,9 @@
p += 2;
*to = (*p - 'a' + 1) + (*(p + 1) - '1' + 2 ) * 10;
p += 2;
-
+
if (*p == 'q' || *p == 'r' || *p == 'b' || *p =='n' ||
- *p =='Q' || *p =='R' || *p == 'B' || *p == 'N' ) {
+ *p =='Q' || *p =='R' || *p == 'B' || *p == 'N' ) {
/* Promotion */
if (*to < A2)
*to = 128 + *to - A1 + (ascii_to_piece (*p) + 1) * 8;
@@ -255,7 +254,7 @@
}
}
-int
+int
san_to_move (Position *pos, char *str, Square *from, Square *to)
{
Square zugliste[AB_ZUGL];
@@ -289,14 +288,14 @@
return 0;
}
- /* e.g. ed5 */
- p[1]=p[2];
+ /* e.g. ed5 */
+ p[1]=p[2];
p[2]=p[3];
p[3]=p[4];
p[4]=p[5];
/* not e.g. bb3 */
- if (p[0] != p[1])
+ if (p[0] != p[1])
if (!strcmp(p,str)) {
*from = *aq;
*to = *(aq+1);
@@ -324,7 +323,7 @@
/* Ngf3 */
tmp =p[2];
- p[2]=p[3];
+ p[2]=p[3];
p[3]=p[4];
p[4]=p[5];
@@ -459,7 +458,7 @@
tempdesfile = 1;
else if (same_file(from, checksquare))
desrank = 1;
- else
+ else
tempdesfile = 1;
} else if (pos->square[checksquare] != EMPTY && checksquare < to) {
tempdesfile = tempdesrank = 0; /* A piece is in the way */
@@ -505,7 +504,7 @@
tempdesfile = 1;
else if (same_file(from, checksquare))
desrank = 1;
- else
+ else
tempdesfile = 1;
} else if (pos->square[checksquare] != EMPTY && checksquare < to) {
tempdesfile = tempdesrank = 0; /* A piece is in the way */
@@ -528,11 +527,11 @@
desfile = 1;
else if (same_file(from, to+jump[i]))
desrank = 1;
- else
+ else
desfile = 1;
}
}
- break;
+ break;
}
Modified: branches/gcomprixogoo/src/chess_computer-activity/chess_notation.h
==============================================================================
--- branches/gcomprixogoo/src/chess_computer-activity/chess_notation.h (original)
+++ branches/gcomprixogoo/src/chess_computer-activity/chess_notation.h Sat Feb 16 00:12:31 2008
@@ -1,19 +1,18 @@
-/*
+/*
* Copyright (C) 1999 Robert Wilhelm
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _NOTATION_H_
Modified: branches/gcomprixogoo/src/chess_computer-activity/chess_position.c
==============================================================================
--- branches/gcomprixogoo/src/chess_computer-activity/chess_position.c (original)
+++ branches/gcomprixogoo/src/chess_computer-activity/chess_position.c Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* engine.h
+/* chess_position.c
*
* Copyright (C) 1999 Robert Wilhelm
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors: Robert Wilhelm
* JP Rosevear
Modified: branches/gcomprixogoo/src/chess_computer-activity/chess_position.h
==============================================================================
--- branches/gcomprixogoo/src/chess_computer-activity/chess_position.h (original)
+++ branches/gcomprixogoo/src/chess_computer-activity/chess_position.h Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* engine.h
+/* chess_position.h
*
* Copyright (C) 1999 Robert Wilhelm
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors: Robert Wilhelm
* JP Rosevear
@@ -50,12 +47,12 @@
GtkObject object;
/* 10x10 board - extra for move generation */
- Piece square[120];
+ Piece square[120];
PositionPrivate *priv;
};
-GtkType position_get_type (void);
+GtkType position_get_type (void);
GtkObject *position_new (void);
GtkObject *position_new_initial (void);
Position *position_copy (Position *pos);
Modified: branches/gcomprixogoo/src/click_on_letter-activity/click_on_letter.c
==============================================================================
--- branches/gcomprixogoo/src/click_on_letter-activity/click_on_letter.c (original)
+++ branches/gcomprixogoo/src/click_on_letter-activity/click_on_letter.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <glib.h>
Modified: branches/gcomprixogoo/src/clickgame-activity/clickgame.c
==============================================================================
--- branches/gcomprixogoo/src/clickgame-activity/clickgame.c (original)
+++ branches/gcomprixogoo/src/clickgame-activity/clickgame.c Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
/* gcompris - clickgame.c
*
- * Time-stamp: <2006/08/21 23:30:07 bruno>
- *
* Copyright (C) 2000-2007 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifdef __APPLE__
Modified: branches/gcomprixogoo/src/clockgame-activity/clockgame.c
==============================================================================
--- branches/gcomprixogoo/src/clockgame-activity/clockgame.c (original)
+++ branches/gcomprixogoo/src/clockgame-activity/clockgame.c Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
/* gcompris - clockgame.c
*
- * Time-stamp: <2006/08/21 23:33:07 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <ctype.h>
Modified: branches/gcomprixogoo/src/colors-activity/colors.c
==============================================================================
--- branches/gcomprixogoo/src/colors-activity/colors.c (original)
+++ branches/gcomprixogoo/src/colors-activity/colors.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "gcompris/gcompris.h"
Modified: branches/gcomprixogoo/src/connect4-activity/connect4.py
==============================================================================
--- branches/gcomprixogoo/src/connect4-activity/connect4.py (original)
+++ branches/gcomprixogoo/src/connect4-activity/connect4.py Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
# gcompris - connect4
#
-# Time-stamp:
-#
# Copyright (C) 2005 Laurent Lacheny
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# The IA code comes from the project 4stattack by Jeroen Vloothuis
Modified: branches/gcomprixogoo/src/connect4-activity/connect4p/board.py
==============================================================================
--- branches/gcomprixogoo/src/connect4-activity/connect4p/board.py (original)
+++ branches/gcomprixogoo/src/connect4-activity/connect4p/board.py Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
-# gcompris - connect4
-#
-# Time-stamp:
-#
-# Copyright (C) 2005 Laurent Lacheny
-#
+# gcompris - connect4
+#
+# Copyright (C) 2005 Laurent Lacheny
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# This code comes from the project 4stattack
@@ -51,15 +48,15 @@
for x in range(7):
self.state.append([])
self.last_move = -1
-
+
def move(self, move, player):
self.state[move].append(player)
self.last_move = move
-
+
def domoves(self, moves):
for (move, player) in moves:
self.move(move, player)
-
+
def undomove(self, move):
if len(self.state[move]) > 0:
del self.state[move][len(self.state[move])-1]
Modified: branches/gcomprixogoo/src/connect4-activity/connect4p/human.py
==============================================================================
--- branches/gcomprixogoo/src/connect4-activity/connect4p/human.py (original)
+++ branches/gcomprixogoo/src/connect4-activity/connect4p/human.py Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
-# gcompris - connect4
-#
-# Time-stamp:
-#
-# Copyright (C) 2005 Laurent Lacheny
-#
+# gcompris - connect4
+#
+# Copyright (C) 2005 Laurent Lacheny
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# This code comes from the project 4stattack
Modified: branches/gcomprixogoo/src/connect4-activity/connect4p/minmax.py
==============================================================================
--- branches/gcomprixogoo/src/connect4-activity/connect4p/minmax.py (original)
+++ branches/gcomprixogoo/src/connect4-activity/connect4p/minmax.py Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
-# gcompris - connect4
-#
-# Time-stamp:
-#
-# Copyright (C) 2005 Laurent Lacheny
-#
+# gcompris - connect4
+#
+# Copyright (C) 2005 Laurent Lacheny
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# This code comes from the project 4stattack
@@ -109,7 +106,7 @@
return options
def statespace(self, node, depth, current_player, player, opponent):
- self.f()
+ self.f()
if rules.isWinner(node.board, opponent):
#print "a lose up ahead"
node.value = -10000 + depth
Modified: branches/gcomprixogoo/src/connect4-activity/connect4p/player.py
==============================================================================
--- branches/gcomprixogoo/src/connect4-activity/connect4p/player.py (original)
+++ branches/gcomprixogoo/src/connect4-activity/connect4p/player.py Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
-# gcompris - connect4
-#
-# Time-stamp:
-#
-# Copyright (C) 2005 Laurent Lacheny
-#
+# gcompris - connect4
+#
+# Copyright (C) 2005 Laurent Lacheny
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# This code comes from the project 4stattack
@@ -50,4 +47,4 @@
def setDifficulty(self, difficulty):
self.difficulty = difficulty
-
+
Modified: branches/gcomprixogoo/src/connect4-activity/connect4p/rules.py
==============================================================================
--- branches/gcomprixogoo/src/connect4-activity/connect4p/rules.py (original)
+++ branches/gcomprixogoo/src/connect4-activity/connect4p/rules.py Sat Feb 16 00:12:31 2008
@@ -1,22 +1,21 @@
-# gcompris - connect4
-#
-# Time-stamp:
-#
-# Copyright (C) 2005 Laurent Lacheny
-#
+# gcompris - connect4
+#
+# Time-stamp:
+#
+# Copyright (C) 2005 Laurent Lacheny
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# This code comes from the project 4stattack
@@ -51,7 +50,7 @@
def isBoardFull(board):
for pos in range(7):
if len(board.state[pos]) < 6:
- return 0
+ return 0
return 1
def isWinner(board, player):
@@ -86,7 +85,7 @@
return ((x -3 + i,y),( x +i,y))
except IndexError:
pass
-
+
return None
def _isDiagonalWin(board, player):
@@ -98,7 +97,7 @@
try:
if (x+i < 0) or (y+i < 0):
row.append('s') # 's' stands for sentinel
- else:
+ else:
row.append(board.state[x+i][y+i])
except IndexError:
row.append('s') # 's' stands for sentinel
@@ -114,7 +113,7 @@
try:
if (x+i < 0) or (y-i < 0):
row.append('s') # 's' stands for sentinel
- else:
+ else:
row.append(board.state[x+i][y-i])
except IndexError:
row.append('s') # 's' stands for sentinel
@@ -124,5 +123,5 @@
return ((x -3 + i , y + 3 - i),( x +i , y - i))
except IndexError:
pass
-
+
return None
Modified: branches/gcomprixogoo/src/crane-activity/crane.c
==============================================================================
--- branches/gcomprixogoo/src/crane-activity/crane.c (original)
+++ branches/gcomprixogoo/src/crane-activity/crane.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <string.h>
Modified: branches/gcomprixogoo/src/drawnumber-activity/clickanddraw.py
==============================================================================
--- branches/gcomprixogoo/src/drawnumber-activity/clickanddraw.py (original)
+++ branches/gcomprixogoo/src/drawnumber-activity/clickanddraw.py Sat Feb 16 00:12:31 2008
@@ -1,12 +1,11 @@
# gcompris - clickanddraw
#
-# Time-stamp: <2007/03/30 20:04:45 olivier>
#
# Copyright (C) 2007 Olivier Ponchaut
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -15,8 +14,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
import goocanvas
Modified: branches/gcomprixogoo/src/drawnumber-activity/drawnumber.py
==============================================================================
--- branches/gcomprixogoo/src/drawnumber-activity/drawnumber.py (original)
+++ branches/gcomprixogoo/src/drawnumber-activity/drawnumber.py Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
# gcompris - drawnumber
#
-# Time-stamp: <2007/03/30 20:04:45 olivier>
-#
# Copyright (C) 2007 Olivier Ponchaut
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -15,8 +13,8 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+
#
import goocanvas
Modified: branches/gcomprixogoo/src/electric-activity/electric.py
==============================================================================
--- branches/gcomprixogoo/src/electric-activity/electric.py (original)
+++ branches/gcomprixogoo/src/electric-activity/electric.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
import goocanvas
Modified: branches/gcomprixogoo/src/enumerate-activity/enumerate.c
==============================================================================
--- branches/gcomprixogoo/src/enumerate-activity/enumerate.c (original)
+++ branches/gcomprixogoo/src/enumerate-activity/enumerate.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <string.h>
Modified: branches/gcomprixogoo/src/erase-activity/erase.c
==============================================================================
--- branches/gcomprixogoo/src/erase-activity/erase.c (original)
+++ branches/gcomprixogoo/src/erase-activity/erase.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <string.h>
Modified: branches/gcomprixogoo/src/fifteen-activity/fifteen.c
==============================================================================
--- branches/gcomprixogoo/src/fifteen-activity/fifteen.c (original)
+++ branches/gcomprixogoo/src/fifteen-activity/fifteen.c Sat Feb 16 00:12:31 2008
@@ -2,10 +2,9 @@
*
* Copyright (C) 2003 Bruno Coudoin
*
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -14,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "gcompris/gcompris.h"
Modified: branches/gcomprixogoo/src/followline-activity/followline.py
==============================================================================
--- branches/gcomprixogoo/src/followline-activity/followline.py (original)
+++ branches/gcomprixogoo/src/followline-activity/followline.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# Follow Line Board module
import gobject
Modified: branches/gcomprixogoo/src/gcompris/about.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/about.c (original)
+++ branches/gcomprixogoo/src/gcompris/about.c Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
/* gcompris - about.c
*
- * Time-stamp: <2006/08/21 23:27:24 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
/**
Modified: branches/gcomprixogoo/src/gcompris/about.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/about.h (original)
+++ branches/gcomprixogoo/src/gcompris/about.h Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
/* GCompris -- about.h
*
- * Time-stamp: <2001/12/26 23:13:29 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef GCOMPRISABOUT_H
#define GCOMPRISABOUT_H
Modified: branches/gcomprixogoo/src/gcompris/anim.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/anim.c (original)
+++ branches/gcomprixogoo/src/gcompris/anim.c Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
/* gcompris - anim.c
*
- * Time-stamp: <2005/02/13 11:59:55 joe>
- *
* Copyright (C) 2005 Joe Neeman
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "anim.h"
Modified: branches/gcomprixogoo/src/gcompris/anim.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/anim.h (original)
+++ branches/gcomprixogoo/src/gcompris/anim.h Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
/* gcompris - anim.h
*
- * Time-stamp: <2005/02/13 11:59:55 joe>
- *
* Copyright (C) 2000 Joe Neeman
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef GCOMPRISANIM_H
Modified: branches/gcomprixogoo/src/gcompris/bar.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/bar.c (original)
+++ branches/gcomprixogoo/src/gcompris/bar.c Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
/* gcompris - bar.c
*
- * Time-stamp: <2007-04-15 21:03:40 bruno>
- *
* Copyright (C) 2000-2003 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
/**
Modified: branches/gcomprixogoo/src/gcompris/board.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/board.c (original)
+++ branches/gcomprixogoo/src/gcompris/board.c Sat Feb 16 00:12:31 2008
@@ -1,21 +1,20 @@
-/* GCompris -- This files comes from XMMS
+/* GCompris -- board.c : Originaly this files comes from XMMS
*
* XMMS - Cross-platform multimedia player
* Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <string.h>
Modified: branches/gcomprixogoo/src/gcompris/board.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/board.h (original)
+++ branches/gcomprixogoo/src/gcompris/board.h Sat Feb 16 00:12:31 2008
@@ -3,19 +3,18 @@
* XMMS - Cross-platform multimedia player
* Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef BOARD_H
#define BOARD_H
Modified: branches/gcomprixogoo/src/gcompris/board_config.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/board_config.c (original)
+++ branches/gcomprixogoo/src/gcompris/board_config.c Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
/* gcompris - board_config.c
*
- * Time-stamp: <2006/08/21 23:27:57 bruno>
- *
* Copyright (C) 2001 Pascal Georges
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <string.h>
Modified: branches/gcomprixogoo/src/gcompris/board_config.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/board_config.h (original)
+++ branches/gcomprixogoo/src/gcompris/board_config.h Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
/* gcompris - board_config.h
*
- * Time-stamp: <2006/08/29 01:12:58 bruno>
- *
* Copyright (C) 2001 Pascal Georges
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef BOARD_CONFIG_H
@@ -53,11 +50,11 @@
GHashTable *buttons_label,
gchar *init);
-GtkSpinButton *gc_board_config_spin_int(const gchar *label,
- gchar *key,
- gint min,
- gint max,
- gint step,
+GtkSpinButton *gc_board_config_spin_int(const gchar *label,
+ gchar *key,
+ gint min,
+ gint max,
+ gint step,
gint init);
GtkHSeparator *gc_board_conf_separator();
@@ -86,8 +83,8 @@
typedef gboolean (*GcomprisTextCallback) (gchar *key, gchar *text, GtkLabel *label);
-GtkTextView *gc_board_config_textview(const gchar *label,
+GtkTextView *gc_board_config_textview(const gchar *label,
gchar *key,
- const gchar*description,
- gchar *init_text,
+ const gchar*description,
+ gchar *init_text,
GcomprisTextCallback validate);
Modified: branches/gcomprixogoo/src/gcompris/bonus.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/bonus.c (original)
+++ branches/gcomprixogoo/src/gcompris/bonus.c Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
/* gcompris - bonus.c
*
- * Time-stamp: <2001/10/15 01:10:21 bruno>
- *
* Copyright (C) 2001 Pascal George
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "gcompris.h"
Modified: branches/gcomprixogoo/src/gcompris/bonus.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/bonus.h (original)
+++ branches/gcomprixogoo/src/gcompris/bonus.h Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
/* gcompris - bonus.h
*
- * Time-stamp: <2001/10/15 01:10:21 bruno>
- *
* Copyright (C) 2001 Pascal Georges
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef BONUS_H
Modified: branches/gcomprixogoo/src/gcompris/cache.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/cache.c (original)
+++ branches/gcomprixogoo/src/gcompris/cache.c Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
-/* gcompris - gameutil_net.c
- *
- * Time-stamp: <2006/07/10 01:24:04 bruno>
+/* gcompris - cache.c
*
* Copyright (C) 2006 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "gcompris.h"
Modified: branches/gcomprixogoo/src/gcompris/config.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/config.c (original)
+++ branches/gcomprixogoo/src/gcompris/config.c Sat Feb 16 00:12:31 2008
@@ -1,7 +1,5 @@
/* gcompris - config.c
*
- * Time-stamp: <2007-08-22 01:21:16 bruno>
- *
* Copyright (C) 2000-2003 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/gcomprixogoo/src/gcompris/dbus.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/dbus.c (original)
+++ branches/gcomprixogoo/src/gcompris/dbus.c Sat Feb 16 00:12:31 2008
@@ -2,19 +2,18 @@
*
* Copyright (C) 2007 Bruno coudoin
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
/*
Modified: branches/gcomprixogoo/src/gcompris/dialog.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/dialog.c (original)
+++ branches/gcomprixogoo/src/gcompris/dialog.c Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
/* gcompris - dialog.c
*
- * Time-stamp: <2006/08/20 09:52:47 bruno>
- *
* Copyright (C) 2000-2006 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <string.h>
Modified: branches/gcomprixogoo/src/gcompris/drag.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/drag.c (original)
+++ branches/gcomprixogoo/src/gcompris/drag.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "drag.h"
Modified: branches/gcomprixogoo/src/gcompris/drag.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/drag.h (original)
+++ branches/gcomprixogoo/src/gcompris/drag.h Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef GCOMPIRS_DRAG_H
Modified: branches/gcomprixogoo/src/gcompris/file_selector.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/file_selector.c (original)
+++ branches/gcomprixogoo/src/gcompris/file_selector.c Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
/* gcompris - file_selector.c
*
- * Time-stamp: <2006/08/20 10:29:31 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
/**
Modified: branches/gcomprixogoo/src/gcompris/gameutil.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/gameutil.c (original)
+++ branches/gcomprixogoo/src/gcompris/gameutil.c Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
/* gcompris - gameutil.c
*
- * Time-stamp: <2006/08/20 12:41:31 bruno>
- *
* Copyright (C) 2000-2006 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
Modified: branches/gcomprixogoo/src/gcompris/gameutil.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/gameutil.h (original)
+++ branches/gcomprixogoo/src/gcompris/gameutil.h Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
/* gcompris - gameutil.h
*
- * Time-stamp: <2000/07/16 00:32:26 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
/*! \file gameutil.h
Modified: branches/gcomprixogoo/src/gcompris/gc_core.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/gc_core.h (original)
+++ branches/gcomprixogoo/src/gcompris/gc_core.h Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
/* gcompris - gc_core.h
*
- * Time-stamp: <2006/08/20 10:03:53 bruno>
- *
* Copyright (C) 2006 Bruno Coudoin
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
/** These are the functions shared in the GCompris core only, not available to
Modified: branches/gcomprixogoo/src/gcompris/gc_net.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/gc_net.c (original)
+++ branches/gcomprixogoo/src/gcompris/gc_net.c Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
/* gcompris - gameutil_net.c
*
- * Time-stamp: <2006/07/10 01:24:04 bruno>
- *
* Copyright (C) 2006 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "gc_net.h"
Modified: branches/gcomprixogoo/src/gcompris/gc_net.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/gc_net.h (original)
+++ branches/gcomprixogoo/src/gcompris/gc_net.h Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
/* gcompris - gc_net.h
*
- * Time-stamp: <2000/07/16 00:32:26 bruno>
- *
* Copyright (C) 2006 Bruno Coudoin
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
/*! \file net.h
Modified: branches/gcomprixogoo/src/gcompris/gcompris-board.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/gcompris-board.h (original)
+++ branches/gcomprixogoo/src/gcompris/gcompris-board.h Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
/* gcompris - gcompris-board.h
*
- * Time-stamp: <2005/09/21 22:14:01 yves>
- *
* Copyright (C) 2000 Bruno Coudoin
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef TYPES_H
#define TYPES_H
Modified: branches/gcomprixogoo/src/gcompris/gcompris.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/gcompris.c (original)
+++ branches/gcomprixogoo/src/gcompris/gcompris.c Sat Feb 16 00:12:31 2008
@@ -1,20 +1,19 @@
/* gcompris - gcompris.c
*
- * Copyright (C) 2000-2003 Bruno Coudoin
+ * Copyright (C) 2000 Bruno Coudoin
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <signal.h>
Modified: branches/gcomprixogoo/src/gcompris/gcompris.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/gcompris.h (original)
+++ branches/gcomprixogoo/src/gcompris/gcompris.h Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
/* gcompris - gcompris.h
*
- * Time-stamp: <2006/08/20 10:03:53 bruno>
- *
* Copyright (C) 2000,2001,2002 Bruno Coudoin
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _MAIN_H_
Modified: branches/gcomprixogoo/src/gcompris/gcompris_alphabeta.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/gcompris_alphabeta.c (original)
+++ branches/gcomprixogoo/src/gcompris/gcompris_alphabeta.c Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
/* gcompris - gcompris_alphabeta.c
*
- * Time-stamp: <2006/08/21 23:28:14 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "gcompris.h"
@@ -46,13 +43,13 @@
gint m, t, nextBest, index;
g_assert (depth >= 0);
-
+
child = firstChild(treeGame);
*bestChild = -1;
/* g_warning("gc_alphabeta %d %d %d", depth, alpha, beta); */
-
+
/* directly return value for leaf node*/
if ((!child) || (depth == 0)){
/* g_warning("gc_alphabeta %d returns %d bestChild %d", depth, heuristic(treeGame), *bestChild); */
@@ -60,7 +57,7 @@
}
index = 0;
-
+
if (maximize) {
m = alpha;
while (child){
Modified: branches/gcomprixogoo/src/gcompris/gcompris_alphabeta.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/gcompris_alphabeta.h (original)
+++ branches/gcomprixogoo/src/gcompris/gcompris_alphabeta.h Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
/* gcompris - gcompris_alphabeta.h
*
- * Time-stamp: <2006/08/28 21:20:56 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _GOMPRIS_ALPHABETA_H_
Modified: branches/gcomprixogoo/src/gcompris/gcompris_config.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/gcompris_config.h (original)
+++ branches/gcomprixogoo/src/gcompris/gcompris_config.h Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
/* GCompris -- config.h
*
- * Time-stamp: <2001/12/26 23:13:29 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef GCOMPRISCONFIG_H
#define GCOMPRISCONFIG_H
Modified: branches/gcomprixogoo/src/gcompris/gcompris_confirm.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/gcompris_confirm.c (original)
+++ branches/gcomprixogoo/src/gcompris/gcompris_confirm.c Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
/* gcompris - gc_confirm_box.c
*
- * Time-stamp: <2006/08/20 10:14:18 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <string.h>
Modified: branches/gcomprixogoo/src/gcompris/gcompris_db.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/gcompris_db.c (original)
+++ branches/gcomprixogoo/src/gcompris/gcompris_db.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <string.h>
Modified: branches/gcomprixogoo/src/gcompris/gcompris_db.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/gcompris_db.h (original)
+++ branches/gcomprixogoo/src/gcompris/gcompris_db.h Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
/* gcompris - gcompris_db.h
*
- * Time-stamp: <2007/02/13 23:03:39 bruno>
- *
* Copyright (C) 2005 Bruno Coudoin
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
Modified: branches/gcomprixogoo/src/gcompris/gcompris_im.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/gcompris_im.c (original)
+++ branches/gcomprixogoo/src/gcompris/gcompris_im.c Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
/* gcompris - gcompris_im.c
*
- * Time-stamp: <2006/08/21 23:26:19 bruno>
- *
* Copyright (C) 2000,2003 Bruno Coudoin
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "gcompris.h"
@@ -45,8 +42,8 @@
if(gc_profile_get_current())
{
GHashTable *init_im = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
- init_im = gc_db_conf_with_table_get (gc_profile_get_current()->profile_id,
- -1,
+ init_im = gc_db_conf_with_table_get (gc_profile_get_current()->profile_id,
+ -1,
init_im );
properties->default_context = g_hash_table_lookup ( init_im, "default_im");
@@ -71,7 +68,7 @@
g_signal_connect (GTK_WIDGET (window), "focus-out-event",
G_CALLBACK(window_focus_callback), NULL);
-
+
}
void
@@ -81,7 +78,7 @@
gtk_im_context_reset (properties->context);
}
-
+
static gint
im_context_commit_callback (GtkIMContext *imcontext,
gchar *arg1,
@@ -95,7 +92,7 @@
}
return FALSE;
}
-
+
static gint
im_context_preedit_callback (GtkIMContext *imcontext,
gpointer user_data)
@@ -129,6 +126,6 @@
gtk_im_context_focus_in (properties->context);
else
gtk_im_context_focus_out (properties->context);
-
+
return FALSE;
}
Modified: branches/gcomprixogoo/src/gcompris/gcompris_im.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/gcompris_im.h (original)
+++ branches/gcomprixogoo/src/gcompris/gcompris_im.h Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
/* gcompris - gcompris_im.h
*
- * Time-stamp: <2006/08/29 01:18:09 bruno>
- *
* Copyright (C) 2005 Bruno Coudoin
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
/*****************************************************************************/
Modified: branches/gcomprixogoo/src/gcompris/help.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/help.c (original)
+++ branches/gcomprixogoo/src/gcompris/help.c Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
/* gcompris - help.c
*
- * Time-stamp: <2006/08/21 23:26:30 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
/**
Modified: branches/gcomprixogoo/src/gcompris/images_selector.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/images_selector.c (original)
+++ branches/gcomprixogoo/src/gcompris/images_selector.c Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
/* gcompris - images_selector.c
*
- * Time-stamp: <2006/08/21 23:26:43 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
/**
Modified: branches/gcomprixogoo/src/gcompris/log.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/log.c (original)
+++ branches/gcomprixogoo/src/gcompris/log.c Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
/* gcompris - log.c
*
- * Time-stamp: <2003/10/29 18:55:55 bcoudoin>
- *
* Copyright (C) 2004 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
Modified: branches/gcomprixogoo/src/gcompris/menu.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/menu.c (original)
+++ branches/gcomprixogoo/src/gcompris/menu.c Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
/* gcompris - menu.c
*
- * Time-stamp: <2006/08/20 10:45:56 bruno>
- *
* Copyright (C) 2000-2006 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <math.h>
Modified: branches/gcomprixogoo/src/gcompris/pixbuf_util.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/pixbuf_util.c (original)
+++ branches/gcomprixogoo/src/gcompris/pixbuf_util.c Sat Feb 16 00:12:31 2008
@@ -4,9 +4,18 @@
*
* Author: John Ellis
*
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
Modified: branches/gcomprixogoo/src/gcompris/pixbuf_util.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/pixbuf_util.h (original)
+++ branches/gcomprixogoo/src/gcompris/pixbuf_util.h Sat Feb 16 00:12:31 2008
@@ -4,9 +4,18 @@
*
* Author: John Ellis
*
- * This software is released under the GNU General Public License (GNU GPL).
- * Please read the included file COPYING for more information.
- * This software comes with no warranty of any kind, use at your own risk!
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
Modified: branches/gcomprixogoo/src/gcompris/plugin.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/plugin.h (original)
+++ branches/gcomprixogoo/src/gcompris/plugin.h Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
/* gcompris - plugin.h
*
- * Time-stamp: <2005/09/14 23:30:48 yves>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef PLUGIN_H
#define PLUGIN_H
Modified: branches/gcomprixogoo/src/gcompris/profile.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/profile.c (original)
+++ branches/gcomprixogoo/src/gcompris/profile.c Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
/* gcompris - profile.c
*
- * Time-stamp: <2006/08/21 23:26:49 bruno>
- *
* Copyright (C) 2005 Bruno Coudoin
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <stdio.h>
Modified: branches/gcomprixogoo/src/gcompris/profile.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/profile.h (original)
+++ branches/gcomprixogoo/src/gcompris/profile.h Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
/* gcompris - profile.h
*
- * Time-stamp: <2006/08/29 01:16:51 bruno>
- *
* Copyright (C) 2005 Bruno Coudoin
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
/*****************************************************************************/
@@ -67,7 +64,7 @@
/*name of group -- must be unique */
gchar *name;
-
+
/* GcomprisClass containing the group */
gint class_id;
@@ -100,7 +97,7 @@
/* Last Name */
gchar *lastname;
-
+
/* First Name */
gchar *firstname;
@@ -128,7 +125,7 @@
gchar *description;
/* list of GcomprisGroup. if empty user management is disabled */
- GList *group_ids;
+ GList *group_ids;
/* list of activities to play -- gchar section/name */
GList *activities;
Modified: branches/gcomprixogoo/src/gcompris/properties.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/properties.c (original)
+++ branches/gcomprixogoo/src/gcompris/properties.c Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
/* gcompris - properties.c
*
- * Time-stamp: <2006/08/21 23:26:56 bruno>
- *
* Copyright (C) 2000,2003 Bruno Coudoin
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#define G_STDIO_NO_WRAP_ON_UNIX
Modified: branches/gcomprixogoo/src/gcompris/properties.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/properties.h (original)
+++ branches/gcomprixogoo/src/gcompris/properties.h Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
/* gcompris - properties.h
*
- * Time-stamp: <2006/08/28 23:54:33 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _PROPERTIES_H_
Modified: branches/gcomprixogoo/src/gcompris/score.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/score.c (original)
+++ branches/gcomprixogoo/src/gcompris/score.c Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
/* gcompris - score.c
*
- * Time-stamp: <2006/08/21 23:27:04 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
/**
Modified: branches/gcomprixogoo/src/gcompris/score.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/score.h (original)
+++ branches/gcomprixogoo/src/gcompris/score.h Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
/* gcompris - bonus.h
*
- * Time-stamp: <2001/10/15 01:10:21 bruno>
- *
* Copyright (C) 2001 Bruno Coudoin
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef SCORE_H
Modified: branches/gcomprixogoo/src/gcompris/skin.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/skin.c (original)
+++ branches/gcomprixogoo/src/gcompris/skin.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "string.h"
Modified: branches/gcomprixogoo/src/gcompris/skin.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/skin.h (original)
+++ branches/gcomprixogoo/src/gcompris/skin.h Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef SKIN_H
Modified: branches/gcomprixogoo/src/gcompris/soundutil.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/soundutil.c (original)
+++ branches/gcomprixogoo/src/gcompris/soundutil.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "string.h"
Modified: branches/gcomprixogoo/src/gcompris/soundutil.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/soundutil.h (original)
+++ branches/gcomprixogoo/src/gcompris/soundutil.h Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
/* gcompris - gameutil.h
*
- * Time-stamp: <2000/07/16 00:32:26 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef SOUNDUTIL_H
#define SOUNDUTIL_H
Modified: branches/gcomprixogoo/src/gcompris/timer.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/timer.c (original)
+++ branches/gcomprixogoo/src/gcompris/timer.c Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
/* gcompris - timer.c
*
- * Time-stamp: <2001/10/15 01:10:21 bruno>
- *
* Copyright (C) 2002 Bruno coudoin
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "gcompris_config.h"
Modified: branches/gcomprixogoo/src/gcompris/timer.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/timer.h (original)
+++ branches/gcomprixogoo/src/gcompris/timer.h Sat Feb 16 00:12:31 2008
@@ -1,22 +1,19 @@
/* gcompris - timer.h
*
- * Time-stamp: <2001/10/15 01:10:21 bruno>
- *
* Copyright (C) 2001 Pascal Georges
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef TIMER_H
Modified: branches/gcomprixogoo/src/gcompris/wordlist.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/wordlist.c (original)
+++ branches/gcomprixogoo/src/gcompris/wordlist.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <libxml/tree.h>
Modified: branches/gcomprixogoo/src/gcompris/wordlist.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/wordlist.h (original)
+++ branches/gcomprixogoo/src/gcompris/wordlist.h Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,10 +13,9 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-
+
#ifndef WORDLIST_H
#define WORDLIST_H
Modified: branches/gcomprixogoo/src/gletters-activity/gletters.c
==============================================================================
--- branches/gcomprixogoo/src/gletters-activity/gletters.c (original)
+++ branches/gcomprixogoo/src/gletters-activity/gletters.c Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
/* gcompris - gletters.c
*
- * Time-stamp: <2007-04-15 21:15:19 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <string.h>
Modified: branches/gcomprixogoo/src/gnumch-equality-activity/gnumch.py
==============================================================================
--- branches/gcomprixogoo/src/gnumch-equality-activity/gnumch.py (original)
+++ branches/gcomprixogoo/src/gnumch-equality-activity/gnumch.py Sat Feb 16 00:12:31 2008
@@ -1,13 +1,11 @@
# -*- coding: utf-8 -*-
# gcompris - gnumch
#
-# Time-stamp: <2005/10/03 09:16 Joe Neeman>
-#
# Copyright (C) 2005 Joe Neeman
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -16,8 +14,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
import gobject
Modified: branches/gcomprixogoo/src/guessnumber-activity/guessnumber.py
==============================================================================
--- branches/gcomprixogoo/src/guessnumber-activity/guessnumber.py (original)
+++ branches/gcomprixogoo/src/guessnumber-activity/guessnumber.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
import gobject
Modified: branches/gcomprixogoo/src/hanoi-activity/hanoi.c
==============================================================================
--- branches/gcomprixogoo/src/hanoi-activity/hanoi.c (original)
+++ branches/gcomprixogoo/src/hanoi-activity/hanoi.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "gcompris/gcompris.h"
Modified: branches/gcomprixogoo/src/hanoi_real-activity/hanoi_real.c
==============================================================================
--- branches/gcomprixogoo/src/hanoi_real-activity/hanoi_real.c (original)
+++ branches/gcomprixogoo/src/hanoi_real-activity/hanoi_real.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "gcompris/gcompris.h"
Modified: branches/gcomprixogoo/src/hexagon-activity/hexagon.py
==============================================================================
--- branches/gcomprixogoo/src/hexagon-activity/hexagon.py (original)
+++ branches/gcomprixogoo/src/hexagon-activity/hexagon.py Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
# gcompris - Hexagon
#
-# Time-stamp: <2004/31/03 15:10:00 Ingo Konrad>
-#
# Copyright (C) 2004 Christof Petig and Ingo Konrad
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
import goocanvas
import gcompris
Modified: branches/gcomprixogoo/src/imageid-activity/imageid.c
==============================================================================
--- branches/gcomprixogoo/src/imageid-activity/imageid.c (original)
+++ branches/gcomprixogoo/src/imageid-activity/imageid.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <string.h>
Modified: branches/gcomprixogoo/src/leftright-activity/leftright.c
==============================================================================
--- branches/gcomprixogoo/src/leftright-activity/leftright.c (original)
+++ branches/gcomprixogoo/src/leftright-activity/leftright.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "gcompris/gcompris.h"
Modified: branches/gcomprixogoo/src/login-activity/login.py
==============================================================================
--- branches/gcomprixogoo/src/login-activity/login.py (original)
+++ branches/gcomprixogoo/src/login-activity/login.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
import goocanvas
import gcompris
Modified: branches/gcomprixogoo/src/magic_hat_minus-activity/magic_hat.c
==============================================================================
--- branches/gcomprixogoo/src/magic_hat_minus-activity/magic_hat.c (original)
+++ branches/gcomprixogoo/src/magic_hat_minus-activity/magic_hat.c Sat Feb 16 00:12:31 2008
@@ -4,17 +4,16 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
- * but WITHMINUS ANY WARRANTY; without even the implied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "gcompris/gcompris.h"
Modified: branches/gcomprixogoo/src/maze-activity/maze.c
==============================================================================
--- branches/gcomprixogoo/src/maze-activity/maze.c (original)
+++ branches/gcomprixogoo/src/maze-activity/maze.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <librsvg/rsvg.h>
Modified: branches/gcomprixogoo/src/melody-activity/melody.py
==============================================================================
--- branches/gcomprixogoo/src/melody-activity/melody.py (original)
+++ branches/gcomprixogoo/src/melody-activity/melody.py Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
# gcompris - melody
#
-# Time-stamp: <2005/03/05 jose>
-#
# Copyright (C) 2003 Jose Jorge
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
import gobject
import goocanvas
Modified: branches/gcomprixogoo/src/memory-activity/memory.c
==============================================================================
--- branches/gcomprixogoo/src/memory-activity/memory.c (original)
+++ branches/gcomprixogoo/src/memory-activity/memory.c Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
/* gcompris - memory.c
*
- * Time-stamp: <2006/08/21 23:33:28 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
// FIXME: Cleanup of MemoryItem created struct is not done
@@ -1439,7 +1436,10 @@
GList *to_remove = NULL;
for (list = winning_pairs; list != NULL; list=list->next)
- if ((((WINNING *) list->data)->first == firstCard) || (((WINNING *) list->data)->first == secondCard) || (((WINNING *) list->data)->second == firstCard) || (((WINNING *) list->data)->second == secondCard) ){
+ if ((((WINNING *) list->data)->first == firstCard)
+ || (((WINNING *) list->data)->first == secondCard)
+ || (((WINNING *) list->data)->second == firstCard)
+ || (((WINNING *) list->data)->second == secondCard) ){
to_remove = g_list_append( to_remove, list->data);
}
Modified: branches/gcomprixogoo/src/missing_letter-activity/missingletter.c
==============================================================================
--- branches/gcomprixogoo/src/missing_letter-activity/missingletter.c (original)
+++ branches/gcomprixogoo/src/missing_letter-activity/missingletter.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <string.h>
Modified: branches/gcomprixogoo/src/money-activity/money.c
==============================================================================
--- branches/gcomprixogoo/src/money-activity/money.c (original)
+++ branches/gcomprixogoo/src/money-activity/money.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "gcompris/gcompris.h"
Modified: branches/gcomprixogoo/src/money-activity/money_widget.c
==============================================================================
--- branches/gcomprixogoo/src/money-activity/money_widget.c (original)
+++ branches/gcomprixogoo/src/money-activity/money_widget.c Sat Feb 16 00:12:31 2008
@@ -3,20 +3,18 @@
*
* Copyright (C) 2002 Robert Wilhelm
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors: Bruno Coudoin
*
Modified: branches/gcomprixogoo/src/money-activity/money_widget.h
==============================================================================
--- branches/gcomprixogoo/src/money-activity/money_widget.h (original)
+++ branches/gcomprixogoo/src/money-activity/money_widget.h Sat Feb 16 00:12:31 2008
@@ -1,22 +1,20 @@
/*
- * money_pocket.h
+ * money_widget.h
*
* Copyright (C) 2002 Bruno Coudoin
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*
* Authors: Bruno Coudoin
*
Modified: branches/gcomprixogoo/src/mosaic-activity/mosaic.py
==============================================================================
--- branches/gcomprixogoo/src/mosaic-activity/mosaic.py (original)
+++ branches/gcomprixogoo/src/mosaic-activity/mosaic.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
import goocanvas
Modified: branches/gcomprixogoo/src/paratrooper-activity/paratrooper.c
==============================================================================
--- branches/gcomprixogoo/src/paratrooper-activity/paratrooper.c (original)
+++ branches/gcomprixogoo/src/paratrooper-activity/paratrooper.c Sat Feb 16 00:12:31 2008
@@ -6,7 +6,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "gcompris/gcompris.h"
Modified: branches/gcomprixogoo/src/planegame-activity/planegame.c
==============================================================================
--- branches/gcomprixogoo/src/planegame-activity/planegame.c (original)
+++ branches/gcomprixogoo/src/planegame-activity/planegame.c Sat Feb 16 00:12:31 2008
@@ -6,7 +6,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "gcompris/gcompris.h"
Modified: branches/gcomprixogoo/src/pythontemplate-activity/pythontemplate.py
==============================================================================
--- branches/gcomprixogoo/src/pythontemplate-activity/pythontemplate.py (original)
+++ branches/gcomprixogoo/src/pythontemplate-activity/pythontemplate.py Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+# gcompris - pythontemplate.py
+#
+# Copyright (C) 2003 Bruno Coudoin
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
# PythonTemplate Board module
import gtk
import gtk.gdk
Modified: branches/gcomprixogoo/src/pythontest-activity/pythontest.py
==============================================================================
--- branches/gcomprixogoo/src/pythontest-activity/pythontest.py (original)
+++ branches/gcomprixogoo/src/pythontest-activity/pythontest.py Sat Feb 16 00:12:31 2008
@@ -1,3 +1,20 @@
+# gcompris - pythontest
+#
+# Copyright (C) 2003 Bruno Coudoin
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
# PythonTest Board module
import gobject
import goocanvas
Modified: branches/gcomprixogoo/src/railroad-activity/railroad.c
==============================================================================
--- branches/gcomprixogoo/src/railroad-activity/railroad.c (original)
+++ branches/gcomprixogoo/src/railroad-activity/railroad.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "gcompris/gcompris.h"
Modified: branches/gcomprixogoo/src/read_colors-activity/read_colors.c
==============================================================================
--- branches/gcomprixogoo/src/read_colors-activity/read_colors.c (original)
+++ branches/gcomprixogoo/src/read_colors-activity/read_colors.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <string.h>
Modified: branches/gcomprixogoo/src/readingh-activity/reading.c
==============================================================================
--- branches/gcomprixogoo/src/readingh-activity/reading.c (original)
+++ branches/gcomprixogoo/src/readingh-activity/reading.c Sat Feb 16 00:12:31 2008
@@ -6,7 +6,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,12 +15,9 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-// FIXME: Cleanup of LettersItem created struct is not done
-
#include <string.h>
#include "gcompris/gcompris.h"
Modified: branches/gcomprixogoo/src/redraw-activity/redraw.py
==============================================================================
--- branches/gcomprixogoo/src/redraw-activity/redraw.py (original)
+++ branches/gcomprixogoo/src/redraw-activity/redraw.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
from gcompris import gcompris_gettext as _
# PythonTest Board module
Modified: branches/gcomprixogoo/src/reversecount-activity/reversecount.c
==============================================================================
--- branches/gcomprixogoo/src/reversecount-activity/reversecount.c (original)
+++ branches/gcomprixogoo/src/reversecount-activity/reversecount.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "gcompris/gcompris.h"
Modified: branches/gcomprixogoo/src/scalesboard-activity/scale.c
==============================================================================
--- branches/gcomprixogoo/src/scalesboard-activity/scale.c (original)
+++ branches/gcomprixogoo/src/scalesboard-activity/scale.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "gcompris/gcompris.h"
Modified: branches/gcomprixogoo/src/searace-activity/searace.py
==============================================================================
--- branches/gcomprixogoo/src/searace-activity/searace.py (original)
+++ branches/gcomprixogoo/src/searace-activity/searace.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
import gobject
import goocanvas
Modified: branches/gcomprixogoo/src/smallnumbers-activity/smallnumbers.c
==============================================================================
--- branches/gcomprixogoo/src/smallnumbers-activity/smallnumbers.c (original)
+++ branches/gcomprixogoo/src/smallnumbers-activity/smallnumbers.c Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
/* gcompris - smallnumbers.c
*
- * Time-stamp: <2007-04-15 21:17:41 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <string.h>
@@ -252,7 +249,7 @@
for(i=0;
(!gotit && i< nb_item);
i++)
- gotit = smallnumbers_gotkey_item( goo_canvas_item_get_child(boardRootItem, i),
+ gotit = smallnumbers_gotkey_item( goo_canvas_item_get_child(boardRootItem, i),
keyval );
return TRUE;
@@ -352,7 +349,7 @@
/* For each item we need to move */
for(i=0; i<goo_canvas_item_get_n_children(boardRootItem); i++)
- smallnumbers_move_item(goo_canvas_item_get_child(boardRootItem, i));
+ smallnumbers_move_item(goo_canvas_item_get_child(boardRootItem, i));
dummy_id = gtk_timeout_add (speed,
(GtkFunction) smallnumbers_move_items, NULL);
Modified: branches/gcomprixogoo/src/submarine-activity/submarine.c
==============================================================================
--- branches/gcomprixogoo/src/submarine-activity/submarine.c (original)
+++ branches/gcomprixogoo/src/submarine-activity/submarine.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "gcompris/gcompris.h"
@@ -958,7 +957,7 @@
/* resulting_weight > 0 ==> the sub goes deeper
regleur : this is the qty of water */
resulting_weight = weight - ballast_av_air - ballast_ar_air + regleur;
- submarine_vertical_speed = resulting_weight/300.0
+ submarine_vertical_speed = resulting_weight/300.0
+ submarine_horizontal_speed*sin(DEG_TO_RAD(-assiette));
/* if depth rudders are in the same direction */
@@ -970,8 +969,8 @@
}
/* position & depth */
- submarine_x += submarine_horizontal_speed
- * cos(DEG_TO_RAD(assiette))
+ submarine_x += submarine_horizontal_speed
+ * cos(DEG_TO_RAD(assiette))
* UPDATE_DELAY_SLOW/1000.0;
depth += submarine_vertical_speed * UPDATE_DELAY_SLOW/1000.0;
@@ -1072,7 +1071,7 @@
depth+SURFACE_IN_BACKGROUND-whale_y);
/* magnetic detection (dist1) or collision with the whale (dist2 & dist3) */
if ( (dist1 < WHALE_DETECTION_RADIUS
- || dist2 < WHALE_DETECTION_RADIUS
+ || dist2 < WHALE_DETECTION_RADIUS
|| dist3 < WHALE_DETECTION_RADIUS)
&& !submarine_destroyed ) {
g_object_set (whale, "visibility", GOO_CANVAS_ITEM_INVISIBLE, NULL);
Modified: branches/gcomprixogoo/src/sudoku-activity/sudoku.py
==============================================================================
--- branches/gcomprixogoo/src/sudoku-activity/sudoku.py (original)
+++ branches/gcomprixogoo/src/sudoku-activity/sudoku.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
import goocanvas
import gcompris
Modified: branches/gcomprixogoo/src/superbrain-activity/superbrain.c
==============================================================================
--- branches/gcomprixogoo/src/superbrain-activity/superbrain.c (original)
+++ branches/gcomprixogoo/src/superbrain-activity/superbrain.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "gcompris/gcompris.h"
@@ -462,7 +461,7 @@
if(!piece->completed)
{
g_object_set (item, "visibility", GOO_CANVAS_ITEM_INVISIBLE, NULL);
-
+
switch(event->button)
{
case 1:
@@ -479,7 +478,7 @@
piece->selecteditem = g_list_length(piece->listitem)-1;
break;
}
-
+
newitem = g_list_nth_data(piece->listitem,
piece->selecteditem);
g_object_set (newitem, "visibility", GOO_CANVAS_ITEM_VISIBLE, NULL);
Modified: branches/gcomprixogoo/src/tangram-activity/gtans.c
==============================================================================
--- branches/gcomprixogoo/src/tangram-activity/gtans.c (original)
+++ branches/gcomprixogoo/src/tangram-activity/gtans.c Sat Feb 16 00:12:31 2008
@@ -3,19 +3,18 @@
* email: bwt altern org
* smail: Philippe Banwarth, 8 sente du milieu des Gaudins, 95150 Taverny, France.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "gcompris/gcompris.h"
Modified: branches/gcomprixogoo/src/tangram-activity/gtans_callbacks.c
==============================================================================
--- branches/gcomprixogoo/src/tangram-activity/gtans_callbacks.c (original)
+++ branches/gcomprixogoo/src/tangram-activity/gtans_callbacks.c Sat Feb 16 00:12:31 2008
@@ -1,22 +1,20 @@
-
/*
* Copyright (C) 1999 Philippe Banwarth
* email: bwt altern org
* smail: Philippe Banwarth, 8 sente du milieu des Gaudins, 95150 Taverny, France.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifdef HAVE_CONFIG_H
Modified: branches/gcomprixogoo/src/target-activity/target.c
==============================================================================
--- branches/gcomprixogoo/src/target-activity/target.c (original)
+++ branches/gcomprixogoo/src/target-activity/target.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "gcompris/gcompris.h"
Modified: branches/gcomprixogoo/src/traffic-activity/traffic.c
==============================================================================
--- branches/gcomprixogoo/src/traffic-activity/traffic.c (original)
+++ branches/gcomprixogoo/src/traffic-activity/traffic.c Sat Feb 16 00:12:31 2008
@@ -7,7 +7,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -16,8 +16,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <string.h>
Modified: branches/gcomprixogoo/src/traffic-activity/traffic.h
==============================================================================
--- branches/gcomprixogoo/src/traffic-activity/traffic.h (original)
+++ branches/gcomprixogoo/src/traffic-activity/traffic.h Sat Feb 16 00:12:31 2008
@@ -3,11 +3,11 @@
* Copyright (C) 2003 Bruno Coudoin
*
* Based on the original code from Geoff Reedy <vader21 imsa edu>
- * Copyright (C) 2000 Geoff Reedy
+ * Copyright (C) 2000 Geoff Reedy
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -16,35 +16,34 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
/* The format and the dataset for the traffic game in gcompris
* is taken from from
* http://www.javascript-games.org/puzzle/rushhour/
- *
+ *
* [LevelX]
* CardY=string describing card 1
* CardY=string describing card 2
* ...
* Where X is the Gcompris Level (in the control bar)
* Where Y is the sublevel.
- *
+ *
* This is followed by a comma separated list defining the cars on the
* grid. So the string looks as follows:
- *
+ *
* 'ID''X''Y'
- *
+ *
* - 'ID' is one char in the range A-R and X
* A-N Specify a different car color of size 2
* O-R Specify a different car color of size 3
* X Always Red, the goal car of size 2
- *
- * - 'X' xpos numbers between
+ *
+ * - 'X' xpos numbers between
* 1 to 6 for Vertical car
* A to F for Horizontal car
- *
+ *
* - 'Y' ypos numbers between
* 1 to 6 for Horizontal car
* A to F for Vertical car
Modified: branches/gcomprixogoo/src/tuxpaint-activity/tuxpaint.py
==============================================================================
--- branches/gcomprixogoo/src/tuxpaint-activity/tuxpaint.py (original)
+++ branches/gcomprixogoo/src/tuxpaint-activity/tuxpaint.py Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
import goocanvas
import gcompris
Modified: branches/gcomprixogoo/src/wordprocessor-activity/wordprocessor.c
==============================================================================
--- branches/gcomprixogoo/src/wordprocessor-activity/wordprocessor.c (original)
+++ branches/gcomprixogoo/src/wordprocessor-activity/wordprocessor.c Sat Feb 16 00:12:31 2008
@@ -4,7 +4,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <string.h>
Modified: branches/gcomprixogoo/src/wordsgame-activity/wordsgame.c
==============================================================================
--- branches/gcomprixogoo/src/wordsgame-activity/wordsgame.c (original)
+++ branches/gcomprixogoo/src/wordsgame-activity/wordsgame.c Sat Feb 16 00:12:31 2008
@@ -1,12 +1,10 @@
/* gcompris - wordsgame.c
*
- * Time-stamp: <2007-04-15 21:17:08 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -15,8 +13,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <string.h>
@@ -432,7 +429,7 @@
gcomprisBoard->width - 220,
gcomprisBoard->height - 50,
gcomprisBoard->number_of_sublevel);
-
+
gc_bar_set_level(gcomprisBoard);
gc_score_set(gcomprisBoard->sublevel);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]