[gcompris/gcomprixogoo] Windows port in progress.

From: Bruno Coudoin <bcoudoin src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [gcompris/gcomprixogoo] Windows port in progress.
Date: Sun, 10 Jan 2010 20:25:08 +0000 (UTC)
commit c4039a012c1e4e56e3367dce35cad597d5f857cc
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Sun Jan 10 21:24:14 2010 +0100

    Windows port in progress.

 .gitignore                  |    2 +-
 Makefile.mingw.in           |   35 +++----
 global_win32.mak            |   10 +-
 src/boards/Makefile.am      |    1 -
 src/boards/Makefile.mingw   |   50 +----------
 src/erase-activity/erase.c  |   10 +-
 src/gcompris/Makefile.mingw |    8 +-
 src/gcompris/board.c        |  214 +++++++++++++++++++++---------------------
 src/gcompris/gcompris.c     |    4 +-
 9 files changed, 143 insertions(+), 191 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6222b8b..83d7a4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@
 .deps
 .libs
 Makefile
-Makefile.mingw
+/Makefile.mingw
 Makefile.in
 stamp-h1
 aclocal.m4
diff --git a/Makefile.mingw.in b/Makefile.mingw.in
index 16576ee..dcf03b4 100644
--- a/Makefile.mingw.in
+++ b/Makefile.mingw.in
@@ -10,6 +10,7 @@ pkgdatadir = gcompris
 
 GCOMPRIS_SRC = ./src/gcompris
 GCOMPRIS_BOARDS = ./src/boards
+CANVAS_SRC = ./src/goocanvas/src
 GCOMPRIS_INSTALL_DIR = ./win32-install-dir
 
 include global_win32.mak
@@ -23,9 +24,10 @@ NEEDED_DLLS =		$(GNUCHESS_TOP)/bin/pthreadGC2.dll \
 			$(GNUCAP_TOP)/src/MSW/gnucap.exe \
 			$(GTK_TOP)/bin/gspawn-win32-helper.exe \
 			$(GTK_TOP)/bin/intl.dll \
-			$(GTK_TOP)/bin/jpeg62.dll \
+			$(GTK_TOP)/bin/libjpeg-7.dll \
 			$(GTK_TOP)/bin/libatk-1.0-0.dll \
 			$(GTK_TOP)/bin/libcairo-2.dll \
+			$(GTK_TOP)/bin/libexpat-1.dll \
 			$(GTK_TOP)/bin/libgdk-win32-2.0-0.dll \
 			$(GTK_TOP)/bin/libgdk_pixbuf-2.0-0.dll \
 			$(GTK_TOP)/bin/libglib-2.0-0.dll \
@@ -49,7 +51,9 @@ NEEDED_DLLS =		$(GNUCHESS_TOP)/bin/pthreadGC2.dll \
 			$(SDL_TOP)/bin/libvorbis-0.dll \
 			$(SDL_TOP)/bin/libvorbisfile-3.dll \
 			$(SQLITE_TOP)/sqlite3.dll \
-			$(RSVG_TOP)/bin/librsvg-2-2.dll
+			$(RSVG_TOP)/bin/librsvg-2-2.dll \
+			$(CROCO_TOP)/bin/libcroco-0.6-3.dll \
+			$(GSF_TOP)/bin/libgsf-1-114.dll
 
 NEEDED_FILES =		README \
 	     		README.mingw \
@@ -60,7 +64,7 @@ NEEDED_FILES =		README \
 ##
 
 all: Makefile.mingw config.h
-	$(MAKE) -C ./src/goocanvas/src -f Makefile.mingw
+	$(MAKE) -C $(CANVAS_SRC) -f Makefile.mingw
 	$(MAKE) -C $(GCOMPRIS_BOARDS) -f Makefile.mingw
 	$(MAKE) -C $(GCOMPRIS_SRC) -f Makefile.mingw
 
@@ -93,15 +97,17 @@ install: all Makefile.mingw
 
 # Copy mandratory files for the package in the package directory
 prepack: Makefile.mingw
-	mkdir -p $(GCOMPRIS_INSTALL_DIR)/GTK
+	mkdir -p $(GCOMPRIS_INSTALL_DIR)
 	cp $(NEEDED_DLLS) $(GCOMPRIS_INSTALL_DIR)
 	cp $(NEEDED_FILES) $(GCOMPRIS_INSTALL_DIR)
 	cp -r $(GTK_TOP)/etc $(GCOMPRIS_INSTALL_DIR)
-	mkdir -p $(GCOMPRIS_INSTALL_DIR)/GTK/share
+	cp -r $(GTK_TOP)/manifest $(GCOMPRIS_INSTALL_DIR)
+	mkdir -p $(GCOMPRIS_INSTALL_DIR)/share
 	cp -r $(GTK_TOP)/share/themes $(GCOMPRIS_INSTALL_DIR)/share
 	mkdir -p $(GCOMPRIS_INSTALL_DIR)/lib
 	cp -r $(GTK_TOP)/share/locale $(GCOMPRIS_INSTALL_DIR)/lib
 	cp -r $(GTK_TOP)/lib/gtk-2.0 $(GCOMPRIS_INSTALL_DIR)/lib
+	cp $(GCOMPRIS_INSTALL_DIR)/libxml2.dll $(GCOMPRIS_INSTALL_DIR)/libxml2-2.dll
 
 python: Makefile.mingw
 	cp $(PYTHON_TOP)/DLLs/tcl84.dll $(GCOMPRIS_INSTALL_DIR)
@@ -117,7 +123,7 @@ installer: Makefile.mingw gcompris-installer.nsi
 	$(MAKENSIS) gcompris-installer.nsi
 
 clean: Makefile.mingw
-	$(MAKE) -C ./src/goocanvas/src -f Makefile.mingw clean
+	$(MAKE) -C $(CANVAS_SRC) -f Makefile.mingw clean
 	$(MAKE) -C $(GCOMPRIS_SRC) -f Makefile.mingw clean
 	$(MAKE) -C $(GCOMPRIS_BOARDS) -f Makefile.mingw clean
 	rm -rf config.h
@@ -131,7 +137,6 @@ clean: Makefile.mingw
 prep: Makefile.mingw
 	mkdir -p $(GCOMPRIS_INSTALL_DIR)
 	mkdir -p $(GCOMPRIS_INSTALL_DIR)/share/$(pkgdatadir)/boards
-	cd boards ; tar cf - -h --exclude "*.in" --exclude ".*" * | ( cd ../$(GCOMPRIS_INSTALL_DIR)/share/$(pkgdatadir)/boards ; tar xf -) ; cd .. ;
 	@echo "-------------------------------------------------------------------------------"
 	@echo " WARNING: MAKE SURE TO HAVE RUN A MAKE INSTALL OF GCOMPRIS IN /USR/LOCAL FIRST"
 	@echo "-------------------------------------------------------------------------------"
@@ -139,6 +144,9 @@ prep: Makefile.mingw
 	cp -r /usr/local/share/locale/* $(GCOMPRIS_INSTALL_DIR)/share/locale/
 	@echo "Remove other .mo file not from gcompris"
 	find ./win32-install-dir/share/locale/ -name \*.mo | grep -v gcompris.mo | xargs rm -f
+	@echo "Copying activity data from /usr/local/share/gcompris"
+	mkdir -p $(GCOMPRIS_INSTALL_DIR)/share/gcompris
+	cp -r /usr/local/share/gcompris/* $(GCOMPRIS_INSTALL_DIR)/share/gcompris
 	@echo "Copy pixmap"
 	mkdir -p $(GCOMPRIS_INSTALL_DIR)/share/pixmaps
 	cp gcompris.png $(GCOMPRIS_INSTALL_DIR)/share/pixmaps
@@ -148,15 +156,4 @@ prep: Makefile.mingw
 	find $(GCOMPRIS_INSTALL_DIR) -name "Makefile*" -exec rm -f {} \;
 	find $(GCOMPRIS_INSTALL_DIR) -name "*.in" -exec rm -f {} \;
 	find $(GCOMPRIS_INSTALL_DIR) -name "*~" -exec rm -f {} \;
-	@echo Remove svg files
-	find $(GCOMPRIS_INSTALL_DIR) -name "*.svg" -exec rm -f {} \;
-
-svg2png:
-	sed -i "s:\(/[a-zA-Z0-9_-]\+\\.\)svg:\1png:g" boards/*.xml.in
-	sed -i "s:\(/[a-zA-Z0-9_-]\+\\.\)svg:\1png:g" src/*/*.c
-	sed -i "s:\(/[a-zA-Z0-9_-]\+\\.\)svg:\1png:g" src/*/*/*.py
-	for f in `find boards -name '*.svg'`; \
-	  do e=`echo $$f | sed s/.svg/.png/`; \
-	  inkscape -z -f $$f -e $$e; \
-	done
-	cd boards && make && cd ..
+
diff --git a/global_win32.mak b/global_win32.mak
index c844f9d..75e72e9 100644
--- a/global_win32.mak
+++ b/global_win32.mak
@@ -27,8 +27,8 @@ endif
 # Use -g flag when building debug version of Gcompris (including plugins).
 # Use -fnative-struct instead of -mms-bitfields when using mingw 1.1
 # (gcc 2.95)
-#CFLAGS += -O2 -Wall -mno-cygwin -mms-bitfields
-CFLAGS += -g -Wall -mno-cygwin -mms-bitfields
+CFLAGS += -g -Wall -mwindows -mno-cygwin -mms-bitfields
+LDFLAGS =
 
 # If not specified, dlls are built with the default base address of 0x10000000.
 # When loaded into a process address space a dll will be rebased if its base
@@ -54,13 +54,15 @@ endif
 GTK_TOP :=		$(LOCAL_PREFIX)/gtk
 GLIB_TOP :=		$(LOCAL_PREFIX)/gtk
 CAIRO_TOP :=		$(LOCAL_PREFIX)/gtk
-RSVG_TOP :=		$(LOCAL_PREFIX)/rsvg
+RSVG_TOP :=		$(LOCAL_PREFIX)/gtk
+CROCO_TOP :=		$(LOCAL_PREFIX)/gtk
+GSF_TOP :=		$(LOCAL_PREFIX)/gtk
 LIBXML2_TOP :=		$(LOCAL_PREFIX)/libxml2
 SDL_TOP :=		$(LOCAL_PREFIX)/sdl
 GNUCHESS_TOP :=		$(LOCAL_PREFIX)/gnuchess
 PYTHON_TOP :=		$(LOCAL_PREFIX)/Python26
 GNUCAP_TOP :=		$(LOCAL_PREFIX)/gnucap
 SQLITE_TOP :=		$(LOCAL_PREFIX)/sqlite
-FONTCONFIG_TOP :=	$(LOCAL_PREFIX)/fontconfig
+FONTCONFIG_TOP :=	$(LOCAL_PREFIX)/gtk
 ICONV_TOP :=		$(LOCAL_PREFIX)/iconv
 FREETYPE_TOP :=		$(LOCAL_PREFIX)/freetype
diff --git a/src/boards/Makefile.am b/src/boards/Makefile.am
index 7ec9441..6602532 100644
--- a/src/boards/Makefile.am
+++ b/src/boards/Makefile.am
@@ -1,6 +1,5 @@
 if PYTHON_PLUGIN
 python_plugin = libpython.la
-#python_subdir = python mypaint (temporary mypaint removal until ready)
 python_subdir = python
 else
 python_plugin =
diff --git a/src/boards/Makefile.mingw b/src/boards/Makefile.mingw
index 64c3c5c..8a59f52 100644
--- a/src/boards/Makefile.mingw
+++ b/src/boards/Makefile.mingw
@@ -1,18 +1,15 @@
 #
 # Makefile.mingw
 #
-# Description: Makefile for win32 (mingw) version of GCompris Boards (Plugins)
+# Description: Makefile for win32 (mingw) version of python plugin and menu2
 #
 
 #
 # PATHS
 #
 
-GCOMPRIS_PLUGINS := 	.
 GCOMPRIS_TOP :=		../..
 CANVAS_TOP :=		$(GCOMPRIS_TOP)/src/goocanvas/src
-LIBART_TOP :=		$(GCOMPRIS_TOP)/src/libart_lgpl
-GCOMPRIS_INSTALL_DIR :=	$(GCOMPRIS_TOP)/win32-install-dir
 
 ##
 ## VARIABLE DEFINITIONS
@@ -20,8 +17,6 @@ GCOMPRIS_INSTALL_DIR :=	$(GCOMPRIS_TOP)/win32-install-dir
 
 # Compiler Options
 
-CFLAGS =
-
 DEFINES = \
 	 -DPYGOOCANVAS_MAJOR_VERSION=0 \
 	 -DPYGOOCANVAS_MINOR_VERSION=0 \
@@ -41,7 +36,7 @@ include $(GCOMPRIS_TOP)/global_win32.mak
 ## INCLUDE PATHS
 ##
 
-INCLUDE_PATHS +=	-I$(GCOMPRIS_PLUGINS) \
+INCLUDE_PATHS +=	-I. \
 			-I$(GTK_TOP)/include \
 			-I$(GTK_TOP)/include/gtk-2.0 \
 			-I$(GLIB_TOP)/include/glib-2.0 \
@@ -63,40 +58,6 @@ INCLUDE_PATHS +=	-I$(GCOMPRIS_PLUGINS) \
 			-I$(RSVG_TOP)/include/librsvg-2
 
 
-LIB_PATHS =		-L$(GTK_TOP)/lib \
-			-L$(LIBXML2_TOP)/lib \
-			-L$(SDL_TOP)/lib \
-			-L$(GCOMPRIS_TOP)/src/gcompris \
-			-L$(PYTHON_TOP)/lib
-
-
-##
-## LIBRARIES
-##
-
-LIBS =			-lgtk-win32-2.0 \
-			-lglib-2.0 \
-			-lgdk-win32-2.0 \
-			-lgobject-2.0 \
-			-lgmodule-2.0 \
-			-lgdk_pixbuf-2.0 \
-			-lpango-1.0 \
-			-lgnomecanvas-2 \
-			-lart_lgpl_2 \
-			-lpangoft2-1.0 \
-			-latk-1.0 \
-			-lpangowin32-1.0 \
-			-lgdi32 -lgthread-2.0 \
-			-lintl \
-			-lws2_32 \
-			-lpython26 \
-			-lpython \
-			libgcompris-1.la
-
-##
-## RULES
-##
-
 ##
 ## TARGET DEFINITIONS
 ##
@@ -136,9 +97,6 @@ BOARDS_C_SRC =	\
 	menu2.c \
 	$(PYTHON_C_SRC)
 
-
-
-
 BOARDS_OBJECTS = $(BOARDS_C_SRC:%.c=%.o)
 
 
@@ -150,10 +108,6 @@ BOARDS_OBJECTS = $(BOARDS_C_SRC:%.c=%.o)
 %.o: %.c
 	$(CC) $(CFLAGS) $(INCLUDE_PATHS) $(DEFINES) -c $< -o $@
 
-.c.o:
-	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $  o -c $<
-	$(CC) -shared $  o $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $@
-
 libboards: \
 		libboards.a
 
diff --git a/src/erase-activity/erase.c b/src/erase-activity/erase.c
index b38a28b..2b9e26c 100644
--- a/src/erase-activity/erase.c
+++ b/src/erase-activity/erase.c
@@ -157,7 +157,7 @@ static void pause_board (gboolean pause)
     return;
 
   if (timer_id) {
-    gtk_timeout_remove (timer_id);
+    g_source_remove (timer_id);
     timer_id = 0;
   }
 
@@ -333,7 +333,7 @@ static void erase_destroy_all_items()
   }
 
   if (timer_id) {
-    gtk_timeout_remove (timer_id);
+    g_source_remove (timer_id);
     timer_id = 0;
   }
 
@@ -424,9 +424,11 @@ static GooCanvasItem *erase_create_item()
   return NULL;
 }
 
-static void bonus() {
+static gboolean
+bonus() {
   gc_bonus_display(gamewon, GC_BONUS_SMILEY);
   timer_id = 0;
+  return FALSE;
 }
 
 /* ==================================== */
@@ -469,7 +471,7 @@ erase_one_item (GooCanvasItem *item)
     {
       gamewon = TRUE;
       erase_destroy_all_items();
-      timer_id = gtk_timeout_add (4000, (GtkFunction) bonus, NULL);
+      timer_id = g_timeout_add (4000, (GSourceFunc) bonus, NULL);
     }
 
   /* force a cleanup of the sound queue */
diff --git a/src/gcompris/Makefile.mingw b/src/gcompris/Makefile.mingw
index ca59ae7..83a4899 100644
--- a/src/gcompris/Makefile.mingw
+++ b/src/gcompris/Makefile.mingw
@@ -22,12 +22,8 @@ TARGET = gcompris
 
 # Compiler and Linker Options
 
-CFLAGS =
-
 DEFINES =
 
-LDFLAGS = -mwindows -mno-cygwin -mms-bitfields
-
 #-mconsole
 #-mwindows
 
@@ -125,6 +121,8 @@ EXE_OBJECTS = $(EXE_C_SRC:%.c=%.o) $(RC_SRC:%.rc=%.o)
 ## LIBRARIES
 ##
 
+ACTIVITY_LIBS =		../erase-activity/libactivity.a
+
 EXE_LIBS =		../boards/libboards.a \
 			../goocanvas/src/libgoocanvas.a \
 			-lgtk-win32-2.0 \
@@ -178,7 +176,7 @@ install: all
 #
 
 $(TARGET).exe: $(EXE_OBJECTS) ../boards/libboards.a
-	$(CC) $(LDFLAGS) $(EXE_OBJECTS) $(LIB_PATHS) $(EXE_LIBS) -o $(TARGET).exe
+	$(CC) $(LDFLAGS) $(EXE_OBJECTS) $(LIB_PATHS) $(EXE_LIBS) $(ACTIVITY_LIBS) -o $(TARGET).exe
 
 ##
 ## CLEAN RULES
diff --git a/src/gcompris/board.c b/src/gcompris/board.c
index 0b81409..a4a7410 100644
--- a/src/gcompris/board.c
+++ b/src/gcompris/board.c
@@ -29,49 +29,49 @@ static gboolean	 get_board_playing(void);
 
 #ifdef STATIC_MODULE
 int gc_activation_check(char *code);
-extern BoardPlugin * get_advanced_colors_bplugin_info();
-extern BoardPlugin * get_algebra_bplugin_info();
-extern BoardPlugin * get_algebra_guesscount_bplugin_info();
-extern BoardPlugin * get_awele_bplugin_info();
-extern BoardPlugin * get_canal_lock_bplugin_info();
-extern BoardPlugin * get_chess_bplugin_info();
-extern BoardPlugin * get_clickgame_bplugin_info();
-extern BoardPlugin * get_click_on_letter_bplugin_info();
-extern BoardPlugin * get_clockgame_bplugin_info();
-extern BoardPlugin * get_colors_bplugin_info();
-extern BoardPlugin * get_crane_bplugin_info();
-extern BoardPlugin * get_enumerate_bplugin_info();
+/* extern BoardPlugin * get_advanced_colors_bplugin_info(); */
+/* extern BoardPlugin * get_algebra_bplugin_info(); */
+/* extern BoardPlugin * get_algebra_guesscount_bplugin_info(); */
+/* extern BoardPlugin * get_awele_bplugin_info(); */
+/* extern BoardPlugin * get_canal_lock_bplugin_info(); */
+/* extern BoardPlugin * get_chess_bplugin_info(); */
+/* extern BoardPlugin * get_clickgame_bplugin_info(); */
+/* extern BoardPlugin * get_click_on_letter_bplugin_info(); */
+/* extern BoardPlugin * get_clockgame_bplugin_info(); */
+/* extern BoardPlugin * get_colors_bplugin_info(); */
+/* extern BoardPlugin * get_crane_bplugin_info(); */
+/* extern BoardPlugin * get_enumerate_bplugin_info(); */
 extern BoardPlugin * get_erase_bplugin_info();
-extern BoardPlugin * get_fifteen_bplugin_info();
-extern BoardPlugin * get_gletters_bplugin_info();
-extern BoardPlugin * get_gtans_bplugin_info();
-extern BoardPlugin * get_hanoi_bplugin_info();
-extern BoardPlugin * get_hanoi_real_bplugin_info();
-extern BoardPlugin * get_imageid_bplugin_info();
-extern BoardPlugin * get_leftright_bplugin_info();
-extern BoardPlugin * get_machpuzzle_bplugin_info();
-extern BoardPlugin * get_magic_hat_bplugin_info();
-extern BoardPlugin * get_maze_bplugin_info();
-extern BoardPlugin * get_memory_bplugin_info();
+/* extern BoardPlugin * get_fifteen_bplugin_info(); */
+/* extern BoardPlugin * get_gletters_bplugin_info(); */
+/* extern BoardPlugin * get_gtans_bplugin_info(); */
+/* extern BoardPlugin * get_hanoi_bplugin_info(); */
+/* extern BoardPlugin * get_hanoi_real_bplugin_info(); */
+/* extern BoardPlugin * get_imageid_bplugin_info(); */
+/* extern BoardPlugin * get_leftright_bplugin_info(); */
+/* extern BoardPlugin * get_machpuzzle_bplugin_info(); */
+/* extern BoardPlugin * get_magic_hat_bplugin_info(); */
+/* extern BoardPlugin * get_maze_bplugin_info(); */
+/* extern BoardPlugin * get_memory_bplugin_info(); */
 extern BoardPlugin * get_menu_bplugin_info();
-extern BoardPlugin * get_missingletter_bplugin_info();
-extern BoardPlugin * get_money_bplugin_info();
-extern BoardPlugin * get_paratrooper_bplugin_info();
-extern BoardPlugin * get_planegame_bplugin_info();
-extern BoardPlugin * get_railroad_bplugin_info();
-extern BoardPlugin * get_read_colors_bplugin_info();
-extern BoardPlugin * get_reading_bplugin_info();
-extern BoardPlugin * get_reversecount_bplugin_info();
-extern BoardPlugin * get_scale_bplugin_info();
-extern BoardPlugin * get_shapegame_bplugin_info();
-extern BoardPlugin * get_smallnumbers_bplugin_info();
-extern BoardPlugin * get_submarine_bplugin_info();
-extern BoardPlugin * get_superbrain_bplugin_info();
-extern BoardPlugin * get_target_bplugin_info();
-extern BoardPlugin * get_traffic_bplugin_info();
-extern BoardPlugin * get_wordsgame_bplugin_info();
-extern BoardPlugin * get_python_bplugin_info();
-extern BoardPlugin * get_wordprocessor_bplugin_info();
+/* extern BoardPlugin * get_missingletter_bplugin_info(); */
+/* extern BoardPlugin * get_money_bplugin_info(); */
+/* extern BoardPlugin * get_paratrooper_bplugin_info(); */
+/* extern BoardPlugin * get_planegame_bplugin_info(); */
+/* extern BoardPlugin * get_railroad_bplugin_info(); */
+/* extern BoardPlugin * get_read_colors_bplugin_info(); */
+/* extern BoardPlugin * get_reading_bplugin_info(); */
+/* extern BoardPlugin * get_reversecount_bplugin_info(); */
+/* extern BoardPlugin * get_scale_bplugin_info(); */
+/* extern BoardPlugin * get_shapegame_bplugin_info(); */
+/* extern BoardPlugin * get_smallnumbers_bplugin_info(); */
+/* extern BoardPlugin * get_submarine_bplugin_info(); */
+/* extern BoardPlugin * get_superbrain_bplugin_info(); */
+/* extern BoardPlugin * get_target_bplugin_info(); */
+/* extern BoardPlugin * get_traffic_bplugin_info(); */
+/* extern BoardPlugin * get_wordsgame_bplugin_info(); */
+/* extern BoardPlugin * get_python_bplugin_info(); */
+/* extern BoardPlugin * get_wordprocessor_bplugin_info(); */
 
 #define MAX_NUMBER_OF_BOARDS 200
 static BoardPlugin *static_boards_demo[MAX_NUMBER_OF_BOARDS];
@@ -96,78 +96,78 @@ void gc_board_init(void)
 
   bp_data = g_malloc0(sizeof (struct BoardPluginData));
 
-  static_boards_demo[i++] = get_awele_bplugin_info();
-  static_boards_demo[i++] = get_canal_lock_bplugin_info();
-  static_boards_demo[i++] = get_click_on_letter_bplugin_info();
-  static_boards_demo[i++] = get_clickgame_bplugin_info();
-  static_boards_demo[i++] = get_clockgame_bplugin_info();
-  static_boards_demo[i++] = get_colors_bplugin_info();
-  static_boards_demo[i++] = get_crane_bplugin_info();
-  static_boards_demo[i++] = get_enumerate_bplugin_info();
+  /* static_boards_demo[i++] = get_awele_bplugin_info(); */
+  /* static_boards_demo[i++] = get_canal_lock_bplugin_info(); */
+  /* static_boards_demo[i++] = get_click_on_letter_bplugin_info(); */
+  /* static_boards_demo[i++] = get_clickgame_bplugin_info(); */
+  /* static_boards_demo[i++] = get_clockgame_bplugin_info(); */
+  /* static_boards_demo[i++] = get_colors_bplugin_info(); */
+  /* static_boards_demo[i++] = get_crane_bplugin_info(); */
+  /* static_boards_demo[i++] = get_enumerate_bplugin_info(); */
   static_boards_demo[i++] = get_erase_bplugin_info();
-  static_boards_demo[i++] = get_gletters_bplugin_info();
-  static_boards_demo[i++] = get_gtans_bplugin_info();
-  static_boards_demo[i++] = get_hanoi_bplugin_info();
-  static_boards_demo[i++] = get_leftright_bplugin_info();
-  static_boards_demo[i++] = get_magic_hat_bplugin_info();
+  /* static_boards_demo[i++] = get_gletters_bplugin_info(); */
+  /* static_boards_demo[i++] = get_gtans_bplugin_info(); */
+  /* static_boards_demo[i++] = get_hanoi_bplugin_info(); */
+  /* static_boards_demo[i++] = get_leftright_bplugin_info(); */
+  /* static_boards_demo[i++] = get_magic_hat_bplugin_info(); */
   static_boards_demo[i++] = get_menu_bplugin_info();
-  static_boards_demo[i++] = get_money_bplugin_info();
-  static_boards_demo[i++] = get_reading_bplugin_info();
-  static_boards_demo[i++] = get_python_bplugin_info();
-  static_boards_demo[i++] = get_scale_bplugin_info();
-  static_boards_demo[i++] = get_submarine_bplugin_info();
-  static_boards_demo[i++] = get_superbrain_bplugin_info();
-  static_boards_demo[i++] = get_target_bplugin_info();
-  static_boards_demo[i++] = get_wordprocessor_bplugin_info();
+  /* static_boards_demo[i++] = get_money_bplugin_info(); */
+  /* static_boards_demo[i++] = get_reading_bplugin_info(); */
+  /* static_boards_demo[i++] = get_python_bplugin_info(); */
+  /* static_boards_demo[i++] = get_scale_bplugin_info(); */
+  /* static_boards_demo[i++] = get_submarine_bplugin_info(); */
+  /* static_boards_demo[i++] = get_superbrain_bplugin_info(); */
+  /* static_boards_demo[i++] = get_target_bplugin_info(); */
+  /* static_boards_demo[i++] = get_wordprocessor_bplugin_info(); */
   static_boards_demo[i++] = NULL;
 
   i=0;
 
-  static_boards[i++] = get_advanced_colors_bplugin_info();
-  static_boards[i++] = get_algebra_bplugin_info();
-  static_boards[i++] = get_algebra_bplugin_info();
-  static_boards[i++] = get_algebra_guesscount_bplugin_info();
-  static_boards[i++] = get_awele_bplugin_info();
-  static_boards[i++] = get_canal_lock_bplugin_info();
-  static_boards[i++] = get_chess_bplugin_info();
-  static_boards[i++] = get_click_on_letter_bplugin_info();
-  static_boards[i++] = get_clickgame_bplugin_info();
-  static_boards[i++] = get_clockgame_bplugin_info();
-  static_boards[i++] = get_colors_bplugin_info();
-  static_boards[i++] = get_crane_bplugin_info();
-  static_boards[i++] = get_enumerate_bplugin_info();
-  static_boards[i++] = get_erase_bplugin_info();
-  static_boards[i++] = get_fifteen_bplugin_info();
-  static_boards[i++] = get_gletters_bplugin_info();
-  static_boards[i++] = get_gtans_bplugin_info();
-  static_boards[i++] = get_hanoi_bplugin_info();
-  static_boards[i++] = get_hanoi_real_bplugin_info();
-  static_boards[i++] = get_imageid_bplugin_info();
-  static_boards[i++] = get_leftright_bplugin_info();
-  static_boards[i++] = get_machpuzzle_bplugin_info();
-  static_boards[i++] = get_magic_hat_bplugin_info();
-  static_boards[i++] = get_maze_bplugin_info();
-  static_boards[i++] = get_memory_bplugin_info();
-  static_boards[i++] = get_menu_bplugin_info();
-  static_boards[i++] = get_missingletter_bplugin_info();
-  static_boards[i++] = get_money_bplugin_info();
-  static_boards[i++] = get_paratrooper_bplugin_info();
-  static_boards[i++] = get_planegame_bplugin_info();
-  static_boards[i++] = get_python_bplugin_info();
-  static_boards[i++] = get_railroad_bplugin_info();
-  static_boards[i++] = get_read_colors_bplugin_info();
-  static_boards[i++] = get_reading_bplugin_info();
-  static_boards[i++] = get_reversecount_bplugin_info();
-  static_boards[i++] = get_scale_bplugin_info();
-  static_boards[i++] = get_shapegame_bplugin_info();
-  static_boards[i++] = get_smallnumbers_bplugin_info();
-  static_boards[i++] = get_submarine_bplugin_info();
-  static_boards[i++] = get_superbrain_bplugin_info();
-  static_boards[i++] = get_target_bplugin_info();
-  static_boards[i++] = get_traffic_bplugin_info();
-  static_boards[i++] = get_wordprocessor_bplugin_info();
-  static_boards[i++] = get_wordsgame_bplugin_info();
-  static_boards[i++] = NULL;
+  /* static_boards[i++] = get_advanced_colors_bplugin_info(); */
+  /* static_boards[i++] = get_algebra_bplugin_info(); */
+  /* static_boards[i++] = get_algebra_bplugin_info(); */
+  /* static_boards[i++] = get_algebra_guesscount_bplugin_info(); */
+  /* static_boards[i++] = get_awele_bplugin_info(); */
+  /* static_boards[i++] = get_canal_lock_bplugin_info(); */
+  /* static_boards[i++] = get_chess_bplugin_info(); */
+  /* static_boards[i++] = get_click_on_letter_bplugin_info(); */
+  /* static_boards[i++] = get_clickgame_bplugin_info(); */
+  /* static_boards[i++] = get_clockgame_bplugin_info(); */
+  /* static_boards[i++] = get_colors_bplugin_info(); */
+  /* static_boards[i++] = get_crane_bplugin_info(); */
+  /* static_boards[i++] = get_enumerate_bplugin_info(); */
+  /* static_boards[i++] = get_erase_bplugin_info(); */
+  /* static_boards[i++] = get_fifteen_bplugin_info(); */
+  /* static_boards[i++] = get_gletters_bplugin_info(); */
+  /* static_boards[i++] = get_gtans_bplugin_info(); */
+  /* static_boards[i++] = get_hanoi_bplugin_info(); */
+  /* static_boards[i++] = get_hanoi_real_bplugin_info(); */
+  /* static_boards[i++] = get_imageid_bplugin_info(); */
+  /* static_boards[i++] = get_leftright_bplugin_info(); */
+  /* static_boards[i++] = get_machpuzzle_bplugin_info(); */
+  /* static_boards[i++] = get_magic_hat_bplugin_info(); */
+  /* static_boards[i++] = get_maze_bplugin_info(); */
+  /* static_boards[i++] = get_memory_bplugin_info(); */
+  /* static_boards[i++] = get_menu_bplugin_info(); */
+  /* static_boards[i++] = get_missingletter_bplugin_info(); */
+  /* static_boards[i++] = get_money_bplugin_info(); */
+  /* static_boards[i++] = get_paratrooper_bplugin_info(); */
+  /* static_boards[i++] = get_planegame_bplugin_info(); */
+  /* static_boards[i++] = get_python_bplugin_info(); */
+  /* static_boards[i++] = get_railroad_bplugin_info(); */
+  /* static_boards[i++] = get_read_colors_bplugin_info(); */
+  /* static_boards[i++] = get_reading_bplugin_info(); */
+  /* static_boards[i++] = get_reversecount_bplugin_info(); */
+  /* static_boards[i++] = get_scale_bplugin_info(); */
+  /* static_boards[i++] = get_shapegame_bplugin_info(); */
+  /* static_boards[i++] = get_smallnumbers_bplugin_info(); */
+  /* static_boards[i++] = get_submarine_bplugin_info(); */
+  /* static_boards[i++] = get_superbrain_bplugin_info(); */
+  /* static_boards[i++] = get_target_bplugin_info(); */
+  /* static_boards[i++] = get_traffic_bplugin_info(); */
+  /* static_boards[i++] = get_wordprocessor_bplugin_info(); */
+  /* static_boards[i++] = get_wordsgame_bplugin_info(); */
+  /* static_boards[i++] = NULL; */
 
   i=0;
   while(static_boards[i] != NULL) {
diff --git a/src/gcompris/gcompris.c b/src/gcompris/gcompris.c
index a0566e1..be48140 100644
--- a/src/gcompris/gcompris.c
+++ b/src/gcompris/gcompris.c
@@ -904,7 +904,7 @@ display_activation_dialog()
     goo_canvas_widget_new (goo_canvas_get_root_item(GOO_CANVAS(canvas)),
 			   GTK_WIDGET(widget_activation_entry),
 			   BOARDWIDTH / 2 - 50,
-			   BOARDHEIGHT - 60,
+			   BOARDHEIGHT - 90,
 			   100.0,
 			   30.0,
 			   NULL);
@@ -1031,7 +1031,7 @@ activation_done()
     }
 
   gc_board_play( get_board_to_start());
-  gtk_object_destroy (GTK_OBJECT(activation_item));
+  goo_canvas_item_remove (activation_item);
 }
 #endif
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]