- Reverted a commit in which Bruno broke the saving of the content.txt

	  file.
	  merged from trunk r3786


svn path=/branches/GCOMPRIS_8_3/; revision=3787

2 files changed, 12 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 412c8c7..be12ce8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-03-20  Bruno coudoin  <bruno.coudoin@free.fr>
+
+	- Reverted a commit in which Bruno broke the saving of the content.txt
+	  file.
+	  merged from trunk r3786
+
+	* src/gcompris/gc_net.c: (gc_cache_init), (gc_cache_get_relative),
+	(gc_cache_add), (gc_cache_import_pixmap), (gc_cache_remove),
+	(_table_foreach), (gc_cache_save), (gc_cache_destroy):
+
 2009-03-17  Bruno coudoin  <bruno.coudoin@free.fr>
 
 	- Fixed a little issue. It was possible for the user in
diff --git a/src/gcompris/gc_net.c b/src/gcompris/gc_net.c
index 554c86c..9d19ac8 100644
--- a/src/gcompris/gc_net.c
+++ b/src/gcompris/gc_net.c
@@ -227,8 +227,6 @@ GSList *gc_net_dir_read_name(const gchar* dir, const gchar *ext)
 
 void gc_cache_init(void)
 {
-  SUPPORT_OR_RETURN();
-
 #ifdef USE_GNET
   gchar *filename;
   gchar *buf;
@@ -249,8 +247,6 @@ void gc_cache_init(void)
 #ifdef USE_GNET
 static gchar *gc_cache_get_relative(gchar *filename)
 {
-  SUPPORT_OR_RETURN(NULL);
-
   gchar *filename_content, *dirname;
 
   filename_content = gc_file_find_absolute_writeable(CONTENT_FILENAME);
@@ -265,8 +261,6 @@ static gchar *gc_cache_get_relative(gchar *filename)
 
 void gc_cache_add(gchar *filename)
 {
-  SUPPORT_OR_RETURN();
-
 #ifdef USE_GNET
   if(cache_content==NULL)
     return;
@@ -280,8 +274,6 @@ void gc_cache_add(gchar *filename)
 
 gchar* gc_cache_import_pixmap(gchar *filename, gchar *boarddir, gint width, gint height)
 {
-  SUPPORT_OR_RETURN(NULL);
-
 #ifdef USE_GNET
   GdkPixbuf *pixmap;
   gchar *basename, *file, *ext, *name, *abs;
@@ -317,13 +309,13 @@ gchar* gc_cache_import_pixmap(gchar *filename, gchar *boarddir, gint width, gint
   g_free(basename);
   g_free(file);
   return name;
+#else
+  return NULL;
 #endif
 }
 
 void gc_cache_remove(gchar *filename)
 {
-  SUPPORT_OR_RETURN();
-
 #ifdef USE_GNET
   g_remove(filename);
   filename = gc_cache_get_relative(filename);
@@ -340,8 +332,6 @@ struct _table_data
 #ifdef USE_GNET
 static void _table_foreach(gpointer key, gpointer value, gpointer user_data)
 {
-  SUPPORT_OR_RETURN();
-
   struct _table_data *data = (struct _table_data*)user_data;
   gchar * content, *filename;
   gsize length;
@@ -368,8 +358,6 @@ static void _table_foreach(gpointer key, gpointer value, gpointer user_data)
 
 void gc_cache_save(void)
 {
-  SUPPORT_OR_RETURN();
-
 #ifdef USE_GNET
   struct _table_data data;
   FILE *pf;
@@ -395,8 +383,6 @@ void gc_cache_save(void)
 
 void gc_cache_destroy(void)
 {
-  SUPPORT_OR_RETURN();
-
 #ifdef USE_GNET
   gc_cache_save();
   g_hash_table_destroy(cache_content);