diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | src/gcompris/gc_net.c | 18 |
2 files changed, 11 insertions, 16 deletions
@@ -1,3 +1,12 @@ +2009-03-20 Bruno coudoin <bruno.coudoin@free.fr> + + - Reverted a commit in which Bruno broke the saving of the content.txt + file. + + * 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 b1a3a6b..ecc7b73 100644 --- a/src/gcompris/gc_net.c +++ b/src/gcompris/gc_net.c @@ -226,8 +226,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; @@ -248,8 +246,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); @@ -264,8 +260,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; @@ -279,8 +273,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; @@ -316,13 +308,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); @@ -339,8 +331,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; @@ -367,8 +357,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; @@ -394,8 +382,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); |