*** RELEASE 8.2.2 ***

2006-11-18  Bruno coudoin  <bruno.coudoin@free.fr>

	- Added missing somali voices
	- Fixed electricity to work on 'any' gnucap release

	* configure.in:
	* src/boards/python/electric.py:
	* src/boards/python/melody.py:

5 files changed, 69 insertions, 39 deletions

diff --git a/ChangeLog b/ChangeLog
index be25785..f8b2980 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+	*** RELEASE 8.2.2 ***
+
+2006-11-18  Bruno coudoin  <bruno.coudoin@free.fr>
+
+	- Added missing somali voices
+	- Fixed electricity to work on 'any' gnucap release
+
+	* configure.in:
+	* src/boards/python/electric.py:
+	* src/boards/python/melody.py:
+
+	*** RELEASE 8.2.1 ***
+
+2006-11-14  Bruno coudoin  <bruno.coudoin@free.fr>
+
+	* src/gcompris/gameutil.c: (gc_util_create_rootdir): ported to use glib.
+	now acount with accents in windows no more fail to save the config file.
+
 2006-11-13  Bruno coudoin  <bruno.coudoin@free.fr>
 
 	* src/gcompris/properties.c: (gc_prop_config_file_get),
diff --git a/configure.in b/configure.in
index f16e316..52dd584 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(src/gcompris/gcompris.c)
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(gcompris, 8.2.1)
+AM_INIT_AUTOMAKE(gcompris, 8.2.2)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
diff --git a/src/boards/python/electric.py b/src/boards/python/electric.py
index 9e92e2e..b122dc0 100644
--- a/src/boards/python/electric.py
+++ b/src/boards/python/electric.py
@@ -339,11 +339,14 @@ class Gcompris_electric:
         break
     gnucap += " 1f\n"
 
+    gnucap_print = ""
     for component in self.components:
       if component.is_connected():
         thisgnucap = component.to_gnucap("")
-        gnucap += thisgnucap
+        gnucap += thisgnucap[0]
+        gnucap_print += thisgnucap[1]
 
+    gnucap += gnucap_print
     gnucap += ".dc\n"
     gnucap += ".end\n"
     if debug: print gnucap
@@ -863,9 +866,8 @@ class Component(object):
       gnucap += str(self.gnucap_value)
       gnucap += "\n"
       gnucap += model
-      gnucap += ".print dc + v(%s) i(%s)\n" %(self.gnucap_name, self.gnucap_name)
 
-      return gnucap
+      return [gnucap, ".print dc + v(%s) i(%s)\n" %(self.gnucap_name, self.gnucap_name)]
 
     # Callback event to move the component
     def component_move(self, widget, event, component):
@@ -992,8 +994,8 @@ class Diode(Component):
     model = ".model  ddd  d  ( is= 50.u  rs= 0.  n= 0.072  tt= 0.  cjo= 1.p  vj= 1.  m= 0.5\n"
     model += "+ eg= 1.11  xti= 3.  kf= 0.  af= 1.  fc= 0.5  bv= 0.  ibv= 0.001 )\n"
 
-    gnucap = ""
-    gnucap += super(Diode, self).to_gnucap(model)
+    gnucap = []
+    gnucap = super(Diode, self).to_gnucap(model)
     return gnucap
 
 # ----------------------------------------
@@ -1176,15 +1178,14 @@ class Switch2(Component):
     gnucap += " "
     gnucap += str(gnucap_value)
     gnucap += "\n"
-    gnucap += ".print dc + v(%s) i(%s)\n" %(gnucap_name, gnucap_name)
 
-    return gnucap
+    return [gnucap, ".print dc + v(%s) i(%s)\n" %(gnucap_name, gnucap_name)]
 
   # Return the gnucap definition for this component
   # depending of the connected nodes, it create one or two resistor
   def to_gnucap(self, model):
 
-    gnucap = ""
+    gnucap = ["", ""]
 
     # reset set_voltage_intensity counter
     self.gnucap_current_resistor = 0
@@ -1193,18 +1194,22 @@ class Switch2(Component):
     # top resistor
     if self.nodes[0].get_wires() and \
        self.nodes[1].get_wires():
-      gnucap  += self.to_gnucap_res(self.gnucap_name + "_top", 0, 1,
-                                    self.value_top)
+      gnucap_resp = self.to_gnucap_res(self.gnucap_name + "_top", 0, 1,
+                                        self.value_top)
+      gnucap[0] += gnucap_resp[0]
+      gnucap[1] += gnucap_resp[1]
       self.gnucap_nb_resistor += 1
 
     # bottom resistor
     if self.nodes[0].get_wires() and \
        self.nodes[2].get_wires():
-      gnucap += self.to_gnucap_res(self.gnucap_name + "_bot", 0, 2,
-                                     self.value_bottom)
+      gnucap_resp = self.to_gnucap_res(self.gnucap_name + "_bot", 0, 2,
+                                       self.value_bottom)
+      gnucap[0] += gnucap_resp[0]
+      gnucap[1] += gnucap_resp[1]
       self.gnucap_nb_resistor += 1
 
-    return gnucap
+    return [gnucap[0], gnucap[1]]
 
   # Return False if we need more value to complete our component
   # This is usefull in case where one Component is made of several gnucap component
@@ -1347,7 +1352,7 @@ class Rheostat(Component):
       node = self.nodes[i]
       if not node.get_wires():
         gnucap = "* %s: component ignored: not connected\n" %(gnucap_name)
-        return gnucap
+        return [gnucap, ""]
 
     gnucap = gnucap_name
     gnucap += " "
@@ -1362,15 +1367,14 @@ class Rheostat(Component):
     gnucap += " "
     gnucap += str(gnucap_value)
     gnucap += "\n"
-    gnucap += ".print dc + v(%s) i(%s)\n" %(gnucap_name, gnucap_name)
 
-    return gnucap
+    return [gnucap, ".print dc + v(%s) i(%s)\n" %(gnucap_name, gnucap_name)]
 
   # Return the gnucap definition for this component
   # depending of the connected nodes, it create one or two resistor
   def to_gnucap(self, model):
 
-    gnucap = ""
+    gnucap = ["", ""]
 
     # reset set_voltage_intensity counter
     self.gnucap_current_resistor = 0
@@ -1384,9 +1388,11 @@ class Rheostat(Component):
        not self.nodes[1].get_wires() and \
        self.nodes[2].get_wires():
       self.gnucap_nb_resistor = 1
-      gnucap += self.to_gnucap_res(self.gnucap_name + "_all", 0, 2,
-                                   self.resitance)
-      return gnucap
+      gnucap_resp = self.to_gnucap_res(self.gnucap_name + "_all", 0, 2,
+                                       self.resitance)
+      gnucap[0] += gnucap_resp[0]
+      gnucap[1] += gnucap_resp[1]
+      return [gnucap[0], gnucap[1]]
 
 
     self.gnucap_nb_resistor = 0
@@ -1395,17 +1401,21 @@ class Rheostat(Component):
     if self.nodes[0].get_wires() and \
        self.nodes[1].get_wires():
       self.gnucap_nb_resistor += 1
-      gnucap  += self.to_gnucap_res(self.gnucap_name + "_top", 0, 1,
-                                    gnucap_value)
+      gnucap_resp  = self.to_gnucap_res(self.gnucap_name + "_top", 0, 1,
+                                        gnucap_value)
+      gnucap[0] += gnucap_resp[0]
+      gnucap[1] += gnucap_resp[1]
 
     # bottom resistor
     if self.nodes[1].get_wires() and \
        self.nodes[2].get_wires():
       self.gnucap_nb_resistor += 1
-      gnucap += self.to_gnucap_res(self.gnucap_name + "_bot", 1, 2,
-                                     self.resitance - gnucap_value)
+      gnucap_resp = self.to_gnucap_res(self.gnucap_name + "_bot", 1, 2,
+                                       self.resitance - gnucap_value)
+      gnucap[0] += gnucap_resp[0]
+      gnucap[1] += gnucap_resp[1]
 
-    return gnucap
+    return [gnucap[0], gnucap[1]]
 
   # Return False if we need more value to complete our component
   # This is usefull in case one Component is made of several gnucap component
diff --git a/src/boards/python/melody.py b/src/boards/python/melody.py
index b7690fb..cd4fcbd 100644
--- a/src/boards/python/melody.py
+++ b/src/boards/python/melody.py
@@ -39,7 +39,7 @@ class Gcompris_melody:
 
     self.gcomprisBoard.disable_im_context = True
 
-    print("Gcompris_melody __init__.")
+    #print("Gcompris_melody __init__.")
 
     # These are used to let us restart only after the bonux is displayed.
     # When the bonus is displayed, it call us first with pause(1) and then with pause(0)
@@ -56,7 +56,7 @@ class Gcompris_melody:
     self.gcomprisBoard.number_of_sublevel=1
 
     # pause the bg music
-    print "pause sound"
+    #print "pause sound"
     gcompris.sound.pause()
 
     self.timers = []
@@ -128,7 +128,6 @@ class Gcompris_melody:
     #print("Gcompris_melody ok.")
     pass
 
-
   def cleanup(self):
 
     # Clear all timer
@@ -149,6 +148,8 @@ class Gcompris_melody:
                             self.melodylist[self.theme][0]['background'])
     gcompris.bar_set_level(self.gcomprisBoard)
 
+    gcompris.sound.policy_set(gcompris.sound.PLAY_AND_INTERRUPT)
+
     # Create our rootitem. We put each canvas item in it so at the end we
     # only have to kill it. The canvas deletes all the items it contains automaticaly.
     self.rootitem = self.gcomprisBoard.canvas.root().add(
@@ -207,6 +208,7 @@ class Gcompris_melody:
     if self.kidstry == self.solution :
       if (self.increment_level() == 1):
         self.gamewon = 1
+        gcompris.sound.policy_set(self.saved_policy)
         gcompris.bonus.display(1, gcompris.bonus.FLOWER)
 
 
@@ -286,15 +288,19 @@ class Gcompris_melody:
     #print("got key %i" % keyval)
     # Play sounds with the keys
     if ((keyval == gtk.keysyms.KP_1) or (keyval == gtk.keysyms._1)):
+      #print "son1"
       self.sound_play(self.melodylist[self.theme][1][0])
       return True
     if ((keyval == gtk.keysyms.KP_2) or (keyval == gtk.keysyms._2)):
+      #print "son2"
       self.sound_play(self.melodylist[self.theme][1][1])
       return True
     if ((keyval == gtk.keysyms.KP_3) or (keyval == gtk.keysyms._3)):
+      #print "son3"
       self.sound_play(self.melodylist[self.theme][1][2])
       return True
     if ((keyval == gtk.keysyms.KP_4) or (keyval == gtk.keysyms._4)):
+      #print "son4"
       self.sound_play(self.melodylist[self.theme][1][3])
       return True
 
diff --git a/src/gcompris/gameutil.c b/src/gcompris/gameutil.c
index 41792fb..a045c7e 100644
--- a/src/gcompris/gameutil.c
+++ b/src/gcompris/gameutil.c
@@ -23,10 +23,9 @@
 #include <string.h>
 #include <time.h>
 
-/* for gc_util_create_rootdir */
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+/* g_mkdir */
+#define G_STDIO_NO_WRAP_ON_UNIX
+#include <glib/gstdio.h>
 
 /* libxml includes */
 #include <libxml/parserInternals.h>
@@ -630,16 +629,13 @@ gc_util_create_rootdir (gchar *rootdir)
 
   /* Case where ~/.gcompris already exist as a file. We remove it */
   if(g_file_test(rootdir, G_FILE_TEST_IS_REGULAR)) {
-    unlink(rootdir);
+    g_unlink(rootdir);
   }
 
   if(g_file_test(rootdir, G_FILE_TEST_IS_DIR)) {
     return 0;
   }
 
-#if defined WIN32
-  return(mkdir(rootdir));
-#else
-  return(mkdir(rootdir, 0755));
-#endif
+  return(g_mkdir(rootdir, 0755));
+
 }