Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src/gcompris
diff options
context:
space:
mode:
authorBruno Coudoin <bcoudoin@src.gnome.org>2009-03-20 17:52:07 (GMT)
committer Bruno Coudoin <bcoudoin@src.gnome.org>2009-03-20 17:52:07 (GMT)
commit54dc1c1bf7c8c29dc7f8a4d7968dc593702ae368 (patch)
tree4ecce3081b7faffe45a0ce49835c58d6dfac3d18 /src/gcompris
parentd595caaee2cb6c2adf35d4f4bdf31fb5f5ffbe77 (diff)
- Reverted a commit in which Bruno broke the saving of the content.txt
file. svn path=/trunk/; revision=3786
Diffstat (limited to 'src/gcompris')
-rw-r--r--src/gcompris/gc_net.c18
1 files changed, 2 insertions, 16 deletions
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);