- changed transformation of xml.in files to xml files. Now the translations

	  are no more embedded in them. It was no more used for a while, we take the translation
	  from the po file directly. This saves 2 to 3 MB !.
	- Fixed the escape key on to level menu. It no more stops the menu itself.
	- Added initial support for autopackage software packaging system.

20 files changed, 216 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index f2cda1e..7a82e49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,31 @@
 2006-08-12  Bruno coudoin  <bruno.coudoin@free.fr>
 
+	- changed transformation of xml.in files to xml files. Now the translations
+	  are no more embedded in them. It was no more used for a while, we take the translation
+	  from the po file directly. This saves 2 to 3 MB !.
+	- Fixed the escape key on to level menu. It no more stops the menu itself.
+
+	* boards/Makefile.am:
+	* boards/advanced_colors/Makefile.am:
+	* boards/babymatch/Makefile.am:
+	* boards/babyshapes/Makefile.am:
+	* boards/chronos/Makefile.am:
+	* boards/doubleentry/Makefile.am:
+	* boards/flags/Makefile.am:
+	* boards/gcompris/mimetypes/Makefile.am:
+	* boards/geography/Makefile.am:
+	* boards/imageid/Makefile.am:
+	* boards/imagename/Makefile.am:
+	* boards/missing_letter/Makefile.am:
+	* boards/paintings/Makefile.am:
+	* boards/read_colors/Makefile.am:
+	* boards/scales/Makefile.am:
+	* configure.in:
+	* src/gcompris/gcompris.c: (board_widget_key_press_callback),
+	(setup_window):
+
+2006-08-12  Bruno coudoin  <bruno.coudoin@free.fr>
+
 	- fixed many bad reference to sounds.
 	- melody game playable again.
 	
diff --git a/autopackage/.cvsignore b/autopackage/.cvsignore
new file mode 100644
index 0000000..6cfc7e6
--- /dev/null
+++ b/autopackage/.cvsignore
@@ -0,0 +1 @@
+default.apspec
diff --git a/autopackage/default.apspec.in b/autopackage/default.apspec.in
new file mode 100644
index 0000000..570c324
--- /dev/null
+++ b/autopackage/default.apspec.in
@@ -0,0 +1,64 @@
+# -*- shell-script -*-
+# Generated by mkapspec 0.2
+[Meta]
+ShortName: gcompris
+SoftwareVersion: @VERSION@
+DisplayName: GCompris Educational software
+RootName: @gcompris.net/gcompris:$SOFTWAREVERSION
+Summary:  GCompris is an educational software which propose different activities to children from 2 to 10 years old.
+Maintainer: Bruno Coudoin <bruno.coudoin@free.fr>
+Packager: Bruno Coudoin <bruno.coudoin@free.fr>
+PackageVersion: 1
+CPUArchitectures: x86
+AutopackageTarget: 1.0
+Type: Application
+License: GNU General Public License (GPL)
+
+[Description]
+Some of the activities are game orientated, but nonetheless still educational.
+Below you can find a list of categories with some of the activities available in that category:
+-  computer discovery: keyboard, mouse, different mouse gesture, ...
+-  algebra: table memory, enumeration, double entry table, mirror image, ...
+-  science: the canal lock, the water cycle, the submarine, electric simulation ...
+-  geography: place the country on the map
+-  games: chess, memory, connect 4, oware, sudoku ...
+-  reading: reading practice
+-  other: learn to tell time, puzzle of famous paintings, vector drawing, cartoon making, ...
+
+[BuildPrepare]
+# If you're using autotools, the default should be enough.
+# prepareBuild will set up apbuild and run configure for you. If you
+# need to pass arguments to configure, just add them to prepareBuild:
+# prepareBuild --enable-foo --disable-bar
+prepareBuild
+
+[BuildUnprepare]
+# If you're using prepareBuild above, there is no need to change this!
+unprepareBuild
+
+[Globals]
+
+[Prepare]
+
+[Imports]
+# This command will tell makeinstaller what to include in the package.
+# The selection comes from the files created by 'make install' or equivalent.
+# Usually, you can leave this at the default
+echo '*' | import
+
+[Install]
+# See http://www.autopackage.org/api/ for details
+installExe bin/*
+installLib lib/*.so.*
+installMan 6 man/man6/*
+installData share/gcompris
+installIcon share/pixmaps/gcompris.*
+installLocale share/locale/
+# You probably need to change the category
+installDesktop "Edutainment" share/applications/gcompris.desktop
+
+[Uninstall]
+# Leaving this at the default is safe unless you use custom commands in
+# "Install" to create files. By default, all autopackage API functions are
+# logged.
+uninstallFromLog
diff --git a/boards/Makefile.am b/boards/Makefile.am
index 0e912e0..d580dd0 100644
--- a/boards/Makefile.am
+++ b/boards/Makefile.am
@@ -136,6 +136,12 @@ xml_in_files = \
 
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 
-@INTLTOOL_XML_RULE@
+#
+# Do not use the INTLTOOL_XML_RULE, we don't need to embed the translations
+# in the file themselves. GCompris pick the translations from the po file at
+# runtime.
+#
+$(xml_DATA): %.xml: %.xml.in
+	sed -e "s/\(\<\)\/*_//g" $< > $@
 
 CLEANFILES = $(xml_DATA)
diff --git a/boards/advanced_colors/Makefile.am b/boards/advanced_colors/Makefile.am
index 7b13434..64fa4cd 100644
--- a/boards/advanced_colors/Makefile.am
+++ b/boards/advanced_colors/Makefile.am
@@ -11,10 +11,17 @@ xml_in_files = \
 	board7.xml.in \
 	board8.xml.in \
 	board9.xml.in
-	
+
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 
-@INTLTOOL_XML_RULE@
+#
+# Do not use the INTLTOOL_XML_RULE, we don't need to embed the translations
+# in the file themselves. GCompris pick the translations from the po file at
+# runtime.
+#
+$(xml_DATA): %.xml: %.xml.in
+	sed -e "s/\(\<\)\/*_//g" $< > $@
+
 
 
 
diff --git a/boards/babymatch/Makefile.am b/boards/babymatch/Makefile.am
index fe79c9a..959b9f5 100644
--- a/boards/babymatch/Makefile.am
+++ b/boards/babymatch/Makefile.am
@@ -12,7 +12,14 @@ xml_in_files = \
 
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 
-@INTLTOOL_XML_RULE@
+#
+# Do not use the INTLTOOL_XML_RULE, we don't need to embed the translations
+# in the file themselves. GCompris pick the translations from the po file at
+# runtime.
+#
+$(xml_DATA): %.xml: %.xml.in
+	sed -e "s/\(\<\)\/*_//g" $< > $@
+
 
 
 
diff --git a/boards/babyshapes/Makefile.am b/boards/babyshapes/Makefile.am
index c329b01..3535b44 100644
--- a/boards/babyshapes/Makefile.am
+++ b/boards/babyshapes/Makefile.am
@@ -12,7 +12,14 @@ xml_in_files = \
 
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 
-@INTLTOOL_XML_RULE@
+#
+# Do not use the INTLTOOL_XML_RULE, we don't need to embed the translations
+# in the file themselves. GCompris pick the translations from the po file at
+# runtime.
+#
+$(xml_DATA): %.xml: %.xml.in
+	sed -e "s/\(\<\)\/*_//g" $< > $@
+
 
 
 
diff --git a/boards/chronos/Makefile.am b/boards/chronos/Makefile.am
index 48e5c26..79857a5 100644
--- a/boards/chronos/Makefile.am
+++ b/boards/chronos/Makefile.am
@@ -18,7 +18,14 @@ xml_in_files = \
 
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 
-@INTLTOOL_XML_RULE@
+#
+# Do not use the INTLTOOL_XML_RULE, we don't need to embed the translations
+# in the file themselves. GCompris pick the translations from the po file at
+# runtime.
+#
+$(xml_DATA): %.xml: %.xml.in
+	sed -e "s/\(\<\)\/*_//g" $< > $@
+
 
 
 
diff --git a/boards/doubleentry/Makefile.am b/boards/doubleentry/Makefile.am
index f91c5f0..94c81f3 100644
--- a/boards/doubleentry/Makefile.am
+++ b/boards/doubleentry/Makefile.am
@@ -8,7 +8,14 @@ xml_in_files = \
 
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 
-@INTLTOOL_XML_RULE@
+#
+# Do not use the INTLTOOL_XML_RULE, we don't need to embed the translations
+# in the file themselves. GCompris pick the translations from the po file at
+# runtime.
+#
+$(xml_DATA): %.xml: %.xml.in
+	sed -e "s/\(\<\)\/*_//g" $< > $@
+
 
 
 
diff --git a/boards/flags/Makefile.am b/boards/flags/Makefile.am
index 0421875..8b3d363 100644
--- a/boards/flags/Makefile.am
+++ b/boards/flags/Makefile.am
@@ -8,7 +8,14 @@ assetml_in_files = \
 
 assetml_DATA = $(assetml_in_files:.assetml.in=.assetml)
 
-@INTLTOOL_XML_RULE@
+#
+# Do not use the INTLTOOL_XML_RULE, we don't need to embed the translations
+# in the file themselves. GCompris pick the translations from the po file at
+# runtime.
+#
+$(xml_DATA): %.xml: %.xml.in
+	sed -e "s/\(\<\)\/*_//g" $< > $@
+
 
 
 
diff --git a/boards/gcompris/mimetypes/Makefile.am b/boards/gcompris/mimetypes/Makefile.am
index 7a3bc70..b739aeb 100644
--- a/boards/gcompris/mimetypes/Makefile.am
+++ b/boards/gcompris/mimetypes/Makefile.am
@@ -5,7 +5,14 @@ xml_in_files = \
 
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 
-@INTLTOOL_XML_RULE@
+#
+# Do not use the INTLTOOL_XML_RULE, we don't need to embed the translations
+# in the file themselves. GCompris pick the translations from the po file at
+# runtime.
+#
+$(xml_DATA): %.xml: %.xml.in
+	sed -e "s/\(\<\)\/*_//g" $< > $@
+
 
 
 
diff --git a/boards/geography/Makefile.am b/boards/geography/Makefile.am
index 68411e1..31d7579 100644
--- a/boards/geography/Makefile.am
+++ b/boards/geography/Makefile.am
@@ -17,7 +17,14 @@ xml_in_files = \
 
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 
-@INTLTOOL_XML_RULE@
+#
+# Do not use the INTLTOOL_XML_RULE, we don't need to embed the translations
+# in the file themselves. GCompris pick the translations from the po file at
+# runtime.
+#
+$(xml_DATA): %.xml: %.xml.in
+	sed -e "s/\(\<\)\/*_//g" $< > $@
+
 
 
 
diff --git a/boards/imageid/Makefile.am b/boards/imageid/Makefile.am
index 7e70420..67b8ad6 100644
--- a/boards/imageid/Makefile.am
+++ b/boards/imageid/Makefile.am
@@ -6,7 +6,14 @@ xml_in_files = \
 
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 
-@INTLTOOL_XML_RULE@
+#
+# Do not use the INTLTOOL_XML_RULE, we don't need to embed the translations
+# in the file themselves. GCompris pick the translations from the po file at
+# runtime.
+#
+$(xml_DATA): %.xml: %.xml.in
+	sed -e "s/\(\<\)\/*_//g" $< > $@
+
 
 
 
diff --git a/boards/imagename/Makefile.am b/boards/imagename/Makefile.am
index e92e9a9..32acb22 100644
--- a/boards/imagename/Makefile.am
+++ b/boards/imagename/Makefile.am
@@ -11,7 +11,14 @@ xml_in_files = \
 
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 
-@INTLTOOL_XML_RULE@
+#
+# Do not use the INTLTOOL_XML_RULE, we don't need to embed the translations
+# in the file themselves. GCompris pick the translations from the po file at
+# runtime.
+#
+$(xml_DATA): %.xml: %.xml.in
+	sed -e "s/\(\<\)\/*_//g" $< > $@
+
 
 
 
diff --git a/boards/missing_letter/Makefile.am b/boards/missing_letter/Makefile.am
index fb53d80..78582b5 100644
--- a/boards/missing_letter/Makefile.am
+++ b/boards/missing_letter/Makefile.am
@@ -6,7 +6,14 @@ xml_in_files = \
 
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 
-@INTLTOOL_XML_RULE@
+#
+# Do not use the INTLTOOL_XML_RULE, we don't need to embed the translations
+# in the file themselves. GCompris pick the translations from the po file at
+# runtime.
+#
+$(xml_DATA): %.xml: %.xml.in
+	sed -e "s/\(\<\)\/*_//g" $< > $@
+
 
 
 
diff --git a/boards/paintings/Makefile.am b/boards/paintings/Makefile.am
index f32fd11..4f86e92 100644
--- a/boards/paintings/Makefile.am
+++ b/boards/paintings/Makefile.am
@@ -12,7 +12,14 @@ xml_in_files = \
 
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 
-@INTLTOOL_XML_RULE@
+#
+# Do not use the INTLTOOL_XML_RULE, we don't need to embed the translations
+# in the file themselves. GCompris pick the translations from the po file at
+# runtime.
+#
+$(xml_DATA): %.xml: %.xml.in
+	sed -e "s/\(\<\)\/*_//g" $< > $@
+
 
 
 
diff --git a/boards/read_colors/Makefile.am b/boards/read_colors/Makefile.am
index ba9cd37..36f3ccf 100644
--- a/boards/read_colors/Makefile.am
+++ b/boards/read_colors/Makefile.am
@@ -2,10 +2,17 @@
 xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/read_colors
 
 xml_in_files = board1.xml.in
-	
+
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 
-@INTLTOOL_XML_RULE@
+#
+# Do not use the INTLTOOL_XML_RULE, we don't need to embed the translations
+# in the file themselves. GCompris pick the translations from the po file at
+# runtime.
+#
+$(xml_DATA): %.xml: %.xml.in
+	sed -e "s/\(\<\)\/*_//g" $< > $@
+
 
 
 
diff --git a/boards/scales/Makefile.am b/boards/scales/Makefile.am
index f3191dc..afbc52d 100644
--- a/boards/scales/Makefile.am
+++ b/boards/scales/Makefile.am
@@ -23,7 +23,14 @@ xml_in_files = \
 
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 
-@INTLTOOL_XML_RULE@
+#
+# Do not use the INTLTOOL_XML_RULE, we don't need to embed the translations
+# in the file themselves. GCompris pick the translations from the po file at
+# runtime.
+#
+$(xml_DATA): %.xml: %.xml.in
+	sed -e "s/\(\<\)\/*_//g" $< > $@
+
 
 
 
diff --git a/configure.in b/configure.in
index 404df2e..1a5ac75 100644
--- a/configure.in
+++ b/configure.in
@@ -457,6 +457,7 @@ AC_OUTPUT([ gcompris.spec
 Makefile.mingw
 gcompris-installer.nsi
 Makefile
+autopackage/default.apspec
 src/Makefile
 src/gcompris/Makefile
 src/gcompris/libgcompris-1.0.pc
diff --git a/src/gcompris/gcompris.c b/src/gcompris/gcompris.c
index 3c6273d..11768a0 100644
--- a/src/gcompris/gcompris.c
+++ b/src/gcompris/gcompris.c
@@ -279,7 +279,8 @@ board_widget_key_press_callback (GtkWidget   *widget,
     case GDK_Escape:
       gcompris_close_all_dialog();
 
-      board_stop();
+      if (get_current_gcompris_board()->previous_board != NULL)
+	board_stop();
       return TRUE;
     case GDK_F5:
       g_message("Refreshing the canvas\n");
@@ -649,6 +650,7 @@ static void setup_window ()
       gtk_window_set_icon (GTK_WINDOW (window), gcompris_icon_pixbuf);
       gdk_pixbuf_unref (gcompris_icon_pixbuf);
     }
+  gtk_window_set_title(GTK_WINDOW (window), "GCompris");
 
   /*
    * Set the main window