Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src/boards
diff options
context:
space:
mode:
authorBruno Coudoin <bcoudoin@src.gnome.org>2009-02-05 00:25:57 (GMT)
committer Bruno Coudoin <bcoudoin@src.gnome.org>2009-02-05 00:25:57 (GMT)
commit48c9a62bc18d8347f994f5d21688d2914c99d124 (patch)
tree6a38bbaf4499657f696ddb7d0ec4b76fe058544c /src/boards
parent1062aef3ec80758b7e3eb3fc1cbcf3e9ca222cc4 (diff)
Miguel DE IZARRA added support for online wordlist.
This save custom data in user_dir and make a content.txt (a md5sum like file) listing custom files. Simply put this files in a web server to diffuse in classroom. GCompris clients are launch with --server and --cache-dir On start, client download content.txt from server. And when a client need a file: - first he search in server list (from content.txt) - if found, he check md5 of file in cache_dir - if md5 isn't ok, file is download in cache_dir file in cache_dir is used - if not found, search in package_dir (like now) svn path=/trunk/; revision=3720
Diffstat (limited to 'src/boards')
-rw-r--r--src/boards/advanced_colors.c2
-rw-r--r--src/boards/imageid.c2
-rw-r--r--src/boards/missingletter.c2
-rw-r--r--src/boards/python/admin/board_list.py7
-rw-r--r--src/boards/read_colors.c2
-rw-r--r--src/boards/shapegame.c2
-rw-r--r--src/boards/superbrain.c4
-rw-r--r--src/boards/wordprocessor.c2
8 files changed, 10 insertions, 13 deletions
diff --git a/src/boards/advanced_colors.c b/src/boards/advanced_colors.c
index e5a223f..dab87de 100644
--- a/src/boards/advanced_colors.c
+++ b/src/boards/advanced_colors.c
@@ -520,7 +520,7 @@ static gboolean read_xml_file(char *fname)
g_return_val_if_fail(fname!=NULL,FALSE);
/* parse the new file and put the result into newdoc */
- doc = gc_net_load_xml(fname);
+ doc = xmlParseFile(fname);
/* in case something went wrong */
if(!doc)
diff --git a/src/boards/imageid.c b/src/boards/imageid.c
index 459d78b..4676355 100644
--- a/src/boards/imageid.c
+++ b/src/boards/imageid.c
@@ -632,7 +632,7 @@ static gboolean read_xml_file(char *fname)
g_return_val_if_fail(fname!=NULL,FALSE);
/* parse the new file and put the result into newdoc */
- doc = gc_net_load_xml(fname);
+ doc = xmlParseFile(fname);
/* in case something went wrong */
if(!doc)
diff --git a/src/boards/missingletter.c b/src/boards/missingletter.c
index 31cc562..5f07d83 100644
--- a/src/boards/missingletter.c
+++ b/src/boards/missingletter.c
@@ -653,7 +653,7 @@ static gboolean read_xml_file(char *fname)
g_return_val_if_fail(fname!=NULL,FALSE);
/* parse the new file and put the result into newdoc */
- doc = gc_net_load_xml(fname);
+ doc = xmlParseFile(fname);
/* in case something went wrong */
if(!doc)
diff --git a/src/boards/python/admin/board_list.py b/src/boards/python/admin/board_list.py
index 18c665d..5b24110 100644
--- a/src/boards/python/admin/board_list.py
+++ b/src/boards/python/admin/board_list.py
@@ -166,13 +166,6 @@ class Board_list:
self.button_locales_sound.show()
box3.pack_end(self.button_locales_sound, False, False, 0)
- self.button_wordlist = gtk.Button(_('Wordlist'))
- self.button_wordlist.connect("clicked", self.wordlist)
- self.button_wordlist.show()
- box3.pack_end(self.button_wordlist, False, False, 0)
- #not ready yet
- self.button_wordlist.set_sensitive(False)
-
self.button_login = gtk.Button(_('Login'))
self.button_login.connect("clicked", self.login_configure)
self.button_login.show()
diff --git a/src/boards/read_colors.c b/src/boards/read_colors.c
index bc1713f..c86b1a3 100644
--- a/src/boards/read_colors.c
+++ b/src/boards/read_colors.c
@@ -472,7 +472,7 @@ static gboolean read_xml_file(char *fname)
g_return_val_if_fail(fname!=NULL,FALSE);
/* parse the new file and put the result into newdoc */
- doc = gc_net_load_xml(fname);
+ doc = xmlParseFile(fname);
/* in case something went wrong */
if(!doc)
diff --git a/src/boards/shapegame.c b/src/boards/shapegame.c
index f25a679..95d3d57 100644
--- a/src/boards/shapegame.c
+++ b/src/boards/shapegame.c
@@ -1746,7 +1746,7 @@ read_xml_file(char *fname)
g_return_val_if_fail(fname!=NULL,FALSE);
/* parse the new file and put the result into newdoc */
- doc = gc_net_load_xml(fname);
+ doc = xmlParseFile(fname);
/* in case something went wrong */
if(!doc)
return FALSE;
diff --git a/src/boards/superbrain.c b/src/boards/superbrain.c
index 65306c3..ef03046 100644
--- a/src/boards/superbrain.c
+++ b/src/boards/superbrain.c
@@ -617,6 +617,10 @@ static void mark_pieces()
current_y_position -= Y_STEP;
+ GList *l;
+ for(l=listPieces; l; l= l->next)
+ g_free(l->data);
+
g_list_free(listPieces);
superbrain_create_item(boardRootItem);
diff --git a/src/boards/wordprocessor.c b/src/boards/wordprocessor.c
index f7d49a5..27aad41 100644
--- a/src/boards/wordprocessor.c
+++ b/src/boards/wordprocessor.c
@@ -1026,7 +1026,7 @@ load_buffer(gchar *file, gchar *file_type)
GtkTextIter iter_start, iter_end;
/* parse the new file and put the result into newdoc */
- doc = gc_net_load_xml(file);
+ doc = xmlParseFile(file);
/* in case something went wrong */
if(!doc)