Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.mingw2
-rw-r--r--gcompris.gifbin0 -> 1240 bytes
-rw-r--r--src/boards/memory.c6
4 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d6ace95..232b985 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-20 Bruno coudoin <bruno.coudoin@free.fr>
+
+ * Makefile.mingw: fixed in make prep
+ * src/boards/memory.c: (get_random_token): removed printout
+
2005-11-19 Bruno coudoin <bruno.coudoin@free.fr>
- Fixed a crash in memory.c
diff --git a/Makefile.mingw b/Makefile.mingw
index 4efdeb8..e2d8a24 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -118,5 +118,5 @@ prep:
@echo "Copy pixmap"
mkdir $(GCOMPRIS_INSTALL_DIR)/share/pixmaps
cp gcompris.png $(GCOMPRIS_INSTALL_DIR)/share/pixmaps
- @echo "Create the file gcompris-win-prepack.tar.gz
+ @echo "Create the file gcompris-win-prepack.tar.gz"
tar -czf gcompris-win-prepack.tar.gz win32-install-dir nsis
diff --git a/gcompris.gif b/gcompris.gif
new file mode 100644
index 0000000..a58a1e6
--- /dev/null
+++ b/gcompris.gif
Binary files differ
diff --git a/src/boards/memory.c b/src/boards/memory.c
index c8d0828..268e605 100644
--- a/src/boards/memory.c
+++ b/src/boards/memory.c
@@ -1,6 +1,6 @@
/* gcompris - memory.c
*
- * Time-stamp: <2005/11/18 23:42:57 bruno>
+ * Time-stamp: <2005/11/19 18:43:42 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
@@ -402,7 +402,7 @@ void get_random_token(int token_type, gint *returned_type, gchar **string)
type = ((DATUM *)list->data)->type;
- printf("K=%d\n", k);
+
switch (type) {
case TYPE_IMAGE:
result= g_strdup(imageList[k]);
@@ -427,7 +427,7 @@ void get_random_token(int token_type, gint *returned_type, gchar **string)
g_error("never !");
break;
}
- printf(" %s\n", result);
+
} while ((j < max_token )
&& (passed_token && result && g_list_find_custom(passed_token, result, (GCompareFunc)strcmp)));