Commit 17382131 authored by Bruno Coudoin's avatar Bruno Coudoin

- Updated for windows release 7.4BETA2

	* config.h.mingw:
	* config.h.windows:
	* gcompris-installer.nsi:
	* src/boards/awele.c: (awele_destroy_all_items),
	(awele_create_item): huge memory leak fixed
	* src/boards/menu2.c: (menu_start): memory leak fixed. This one is probably
	  in many other boards.
	* src/gcompris/anim.c: (gcompris_load_animation): debug string change
	* src/gcompris/gameutil.c: (gcompris_board_has_activity): fixed to have
	  menu properly hidden if empty.
parent c86ba54b
2006-03-30 Bruno coudoin <bruno.coudoin@free.fr>
- Updated for windows release 7.4BETA2
* config.h.mingw:
* config.h.windows:
* gcompris-installer.nsi:
* src/boards/awele.c: (awele_destroy_all_items),
(awele_create_item): huge memory leak fixed
* src/boards/menu2.c: (menu_start): memory leak fixed. This one is probably
in many other boards.
* src/gcompris/anim.c: (gcompris_load_animation): debug string change
* src/gcompris/gameutil.c: (gcompris_board_has_activity): fixed to have
menu properly hidden if empty.
2006-03-29 Yves Combe <yves@ycombe.net>
fix string encoding for operators.
......
......@@ -134,4 +134,4 @@
#define STDC_HEADERS 1
/* Version number of package */
#define VERSION "7.1PRE1"
#define VERSION "7.4BETA2"
/* config.h. Generated by configure. */
/* config.h.in. Generated from configure.in by autoheader. */
/* Supported languages */
#define ALL_LINGUAS "am ar az ca cs de el en_CA en_GB es fi fr he hi hr hu it lt mk ml ms nl no pl pt pt_BR ro ru sk sl sr sr@Latn sv tr"
/* Global assetml directory */
#define ASSETML_DIR "share/assetml"
/* "Enable debug messages." */
/* #undef DEBUG */
/* always defined to indicate that i18n is enabled */
/* #undef ENABLE_NLS */
/* Gettext package name */
#define GETTEXT_PACKAGE "gcompris"
/* Gnome icons directory */
#define GNOME_ICONDIR "share/pixmaps"
/* Defines where GNU Chess resides on the system */
#define GNUCHESS "/usr/bin/gnuchess"
/* Define to 1 if you have the `bind_textdomain_codeset' function. */
/* #undef HAVE_BIND_TEXTDOMAIN_CODESET */
/* Define to 1 if you have the `dcgettext' function. */
/* #undef HAVE_DCGETTEXT */
/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
*/
#define HAVE_DIRENT_H 1
/* Define to 1 if you have the <dlfcn.h> header file. */
/* #undef HAVE_DLFCN_H */
/* Define to 1 if you have the `dlopen' function. */
/* #undef HAVE_DLOPEN */
/* Define if the GNU gettext() function is already present or preinstalled. */
/* #undef HAVE_GETTEXT */
/* Define if you have the iconv() function. */
#define HAVE_ICONV 1
/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1
/* Define if your <locale.h> file defines LC_MESSAGES. */
/* #undef HAVE_LC_MESSAGES */
/* Define to 1 if you have the `popt' library (-lpopt). */
/* #undef HAVE_LIBPOPT */
/* Define to 1 if you have the <locale.h> header file. */
#define HAVE_LOCALE_H 1
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
/* #undef HAVE_NDIR_H */
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1
/* Define to 1 if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1
/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1
/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
*/
/* #undef HAVE_SYS_DIR_H */
/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
*/
/* #undef HAVE_SYS_NDIR_H */
/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1
/* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
/* Define as const if the declaration of iconv() needs const. */
#define ICONV_CONST const
/* Name of package */
#define PACKAGE "gcompris"
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT ""
/* Gcompris data directory */
#define PACKAGE_DATA_DIR "share/gcompris/boards"
/* Gcompris help directory */
#define PACKAGE_HELP_DIR "/usr/local//gnome/help/gcompris"
/* Gcompris locale directory */
#define PACKAGE_LOCALE_DIR "share/locale"
/* Define to the full name of this package. */
#define PACKAGE_NAME ""
/* Gcompris sounds directory */
#define PACKAGE_SOUNDS_DIR "share/gcompris/boards/sounds"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING ""
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME ""
/* Define to the version of this package. */
#define PACKAGE_VERSION ""
/* Gcompris plugins directory */
#define PLUGIN_DIR "/usr/local/lib/gcompris"
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
#define VERSION "6.1"
......@@ -18,7 +18,7 @@ Var STARTUP_RUN_KEY
;The name var is set in .onInit
Name $name
!define GCOMPRIS_VERSION "7.4BETA1"
!define GCOMPRIS_VERSION "7.4BETA2"
OutFile "gcompris-${GCOMPRIS_VERSION}.exe"
......
......@@ -277,10 +277,25 @@ awele_next_level ()
static void
awele_destroy_all_items ()
{
int i;
if (boardRootItem != NULL)
gtk_object_destroy (GTK_OBJECT (boardRootItem));
boardRootItem = NULL;
if(graphsElt)
{
for (i = 0; i < NBHOLE / 2; i++)
{
gdk_pixbuf_unref(graphsElt->pixbufButton[i]);
gdk_pixbuf_unref(graphsElt->pixbufButtonNotify[i]);
gdk_pixbuf_unref(graphsElt->pixbufButtonClicked[i]);
}
g_free(graphsElt);
graphsElt = NULL;
}
}
/*
......@@ -319,6 +334,7 @@ awele_create_item (GnomeCanvasGroup * parent)
"height",
(double) gdk_pixbuf_get_height (pixmap),
"width_set", TRUE, "height_set", TRUE, NULL);
gdk_pixbuf_unref(pixmap);
/*
* Display text
......@@ -391,7 +407,7 @@ awele_create_item (GnomeCanvasGroup * parent)
staticAwale->CapturedBeans[i] = 0;
}
graphsElt = (GRAPHICS_ELT *) malloc (sizeof (GRAPHICS_ELT));
graphsElt = (GRAPHICS_ELT *) g_malloc (sizeof (GRAPHICS_ELT));
/*
* Boucle pour creer et positionner les boutons qui serviront
......
/* gcompris - menu2.c
*
* Time-stamp: <2006/03/21 23:52:35 bruno>
* Time-stamp: <2006/03/30 01:06:42 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -212,13 +212,16 @@ static void menu_start (GcomprisBoard *agcomprisBoard)
if(agcomprisBoard!=NULL)
{
gchar *img;
gcomprisBoard=agcomprisBoard;
menuitems = g_new(MenuItems, 1);
img = gcompris_image_to_skin("gcompris-menu2bg.png");
gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas),
gcompris_image_to_skin("gcompris-menu2bg.png"));
img);
g_free(img);
boardRootItem = GNOME_CANVAS_GROUP(
gnome_canvas_item_new (gnome_canvas_root(gcomprisBoard->canvas),
......
......@@ -74,7 +74,7 @@ GcomprisAnimation *gcompris_load_animation(char *filename)
{
name = (char*) cur->data;
anim->anim[i] = gdk_pixbuf_animation_new_from_file(name, &error);
printf("Opened animation %s\n", name);
g_warning("Opened animation %s\n", name);
if(!anim->anim[i])
{
g_critical("Couldn't open animation %s: %s\n", name, error->message);
......
/* gcompris - gameutil.c
*
* Time-stamp: <2006/03/29 01:34:58 bruno>
* Time-stamp: <2006/03/29 22:03:58 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -698,7 +698,8 @@ gcompris_board_has_activity(gchar *section, gchar *name)
continue;
if ((strcmp (section_name, board->section) == 0) &&
(strlen(board->name) != 0))
(strlen(board->name) != 0) &&
board_check_file(board))
{
if((strcmp(board->type, "menu") == 0) &&
strcmp(board->section, section) != 0)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment