gcompris r3787 - in branches/GCOMPRIS_8_3: . src/gcompris

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Fri Mar 20 17:54:42 2009
New Revision: 3787
URL: http://svn.gnome.org/viewvc/gcompris?rev=3787&view=rev

Log:
	- Reverted a commit in which Bruno broke the saving of the content.txt
	  file.
	  merged from trunk r3786



Modified:
   branches/GCOMPRIS_8_3/ChangeLog
   branches/GCOMPRIS_8_3/src/gcompris/gc_net.c

Modified: branches/GCOMPRIS_8_3/src/gcompris/gc_net.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/gc_net.c	(original)
+++ branches/GCOMPRIS_8_3/src/gcompris/gc_net.c	Fri Mar 20 17:54:42 2009
@@ -227,8 +227,6 @@
 
 void gc_cache_init(void)
 {
-  SUPPORT_OR_RETURN();
-
 #ifdef USE_GNET
   gchar *filename;
   gchar *buf;
@@ -249,8 +247,6 @@
 #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 @@
 
 void gc_cache_add(gchar *filename)
 {
-  SUPPORT_OR_RETURN();
-
 #ifdef USE_GNET
   if(cache_content==NULL)
     return;
@@ -280,8 +274,6 @@
 
 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 @@
   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 @@
 #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 @@
 
 void gc_cache_save(void)
 {
-  SUPPORT_OR_RETURN();
-
 #ifdef USE_GNET
   struct _table_data data;
   FILE *pf;
@@ -395,8 +383,6 @@
 
 void gc_cache_destroy(void)
 {
-  SUPPORT_OR_RETURN();
-
 #ifdef USE_GNET
   gc_cache_save();
   g_hash_table_destroy(cache_content);