diff options
| author | Bruno Coudoin <bcoudoin@src.gnome.org> | 2006-08-12 00:58:07 (GMT) |
|---|---|---|
| committer | Bruno Coudoin <bcoudoin@src.gnome.org> | 2006-08-12 00:58:07 (GMT) |
| commit | ff5005365dd6d82f32b199872a4bab1fd1e7d9fc (patch) | |
| tree | 49d7743c48c5edaa5cbae99eab5f315d6a6c8905 | |
| parent | 7c9d8c5f8483c6c389b31459cc297ed6d2cdb837 (diff) | |
- Fixed africa maps. Removed too tiny country in the whole africa map. Fixed missing
country pixmaps. Closes sourceforge GCompris bug#1538043.
- Added -Werror as a global option. Fixed all warnings. I may have introduced bugs during this
process.
- click_on_letter: re-added the spoken instruction click on the letter
- algebra: re-added the spoken numbers.
70 files changed, 412 insertions, 412 deletions
@@ -1,3 +1,100 @@ +2006-08-12 Bruno coudoin <bruno.coudoin@free.fr> + + - Fixed africa maps. Removed too tiny country in the whole africa map. Fixed missing + country pixmaps. Closes sourceforge GCompris bug#1538043. + + - Added -Werror as a global option. Fixed all warnings. I may have introduced bugs during this + process. + + - click_on_letter: re-added the spoken instruction click on the letter + - algebra: re-added the spoken numbers. + + * boards/geography/africa/angola.png: + * boards/geography/africa/eritrea.png: + * boards/geography/africa/ethiopia.png: + * boards/geography/africa/north_africa.png: + * boards/geography/africa/north_africa.xcf: + * boards/geography/africa/sudan.png: + * boards/geography/afrique/africa.png: + * boards/geography/afrique/burundi.png: + * boards/geography/afrique/djibouti.png: + * boards/geography/afrique/equatorial_guinea.png: + * boards/geography/afrique/gambia.png: + * boards/geography/afrique/guinea_bissau.png: + * boards/geography/afrique/lesotho.png: + * boards/geography/afrique/rwanda.png: + * boards/geography/afrique/sierra_leone.png: + * boards/geography/afrique/swaziland.png: + * boards/geography/board4_0.xml.in: + * boards/geography/board4_2.xml.in: + * configure.in: + * src/boards/Makefile.am: + * src/boards/advanced_colors.c: (add_xml_data), (parse_doc), + (read_xml_file): + * src/boards/algebra.c: (item_event): + * src/boards/chess.c: (engine_local_cb), (start_child), + (write_child): + * src/boards/chess_position.c: (class_init): + * src/boards/click_on_letter.c: (sounds_are_fine): + * src/boards/colors.c: (save_table), (conf_ok): + * src/boards/draw.c: (reset_anchors_line), (load_drawing), + (save_drawing): + * src/boards/enumerate.c: (item_event_focus): + * src/boards/erase.c: (item_event): + * src/boards/fifteen.c: (piece_event): + * src/boards/gtans.c: + * src/boards/gtans_callbacks.c: + (on_wdrawareagrande_button_press_event), (on_rotation_clicked): + * src/boards/hanoi.c: (item_event): + * src/boards/magic_hat.c: (item_event): + * src/boards/menu2.c: (item_event): + * src/boards/money.c: (money_next_level): + * src/boards/money_widget.c: (money_widget_get_total): + * src/boards/planegame.c: + * src/boards/py-gcompris-class.c: (pyGcomprisClassType_setattr): + * src/boards/py-gcompris-group.c: (pyGcomprisGroupType_setattr): + * src/boards/py-gcompris-profile.c: + (pyGcomprisProfileType_setattr): + * src/boards/py-gcompris-properties.c: + (pyGcomprisPropertiesType_setattr): + * src/boards/py-gcompris-user.c: (pyGcomprisUserType_setattr): + * src/boards/py-mod-gcompris.c: (pyGcomprisConfCallback): + * src/boards/py-mod-utils.c: (py_gcompris_canvas_get_property): + * src/boards/python.c: (pythonboard_init): + * src/boards/read_colors.c: (add_xml_data), (read_xml_file): + * src/boards/reading.c: (read_wordfile), (save_table), (conf_ok): + * src/boards/shapegame.c: (key_press), + (add_shape_to_list_of_shapes), (item_event), + (add_xml_shape_to_data), (read_xml_file), (write_shape_to_xml), + (write_xml_file), (save_table), (conf_ok): + * src/boards/smallnumbers.c: (conf_ok): + * src/boards/traffic.c: + * src/boards/wordprocessor.c: (item_event_style_selection): + * src/boards/wordsgame.c: (wordsgame_read_wordfile): + * src/gcompris/about.c: (gcompris_about_start), + (gcompris_about_stop): + * src/gcompris/anim.h: + * src/gcompris/board_config.c: (gcompris_configuration_window): + * src/gcompris/bonus.c: (board_finished), (gcompris_display_bonus), + (end_bonus): + * src/gcompris/config.c: (gcompris_config_start), + (gcompris_config_stop): + * src/gcompris/file_selector.c: (gcompris_file_selector_stop), + (display_file_selector): + * src/gcompris/gameutil.c: (cleanup_menus), + (suppress_int_from_list), (compare_id), (item_event_ok): + * src/gcompris/gcompris_confirm.c: (gcompris_confirm_stop), + (display_confirm): + * src/gcompris/gcompris_im.c: (im_context_commit_callback), + (im_context_preedit_callback): + * src/gcompris/help.c: (gcompris_help_start), (gcompris_help_stop): + * src/gcompris/images_selector.c: (gcompris_images_selector_start), + (gcompris_images_selector_stop): + * src/gcompris/log.c: (gcompris_log_end): + * src/gcompris/profile.c: (gcompris_set_current_user): + * src/gcompris/profile.h: + * src/gcompris/wordlist.c: (gcompris_get_wordlist_from_file): + 2006-08-11 Bruno coudoin <bruno.coudoin@free.fr> - Fixed potential the exit code to avoid a potential core dump when exiting GCompris diff --git a/Makefile.am b/Makefile.am index 569c28b..67fa154 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,7 +38,7 @@ install-data-local: @$(NORMAL_INSTALL) if test -d $(srcdir)/$(PACKAGE_DATA_DIR); then \ $(mkinstalldirs) $(DESTDIR)/$(pkgdatadir)/$(PACKAGE_DATA_DIR); \ - cd $(srcdir)/$(PACKAGE_DATA_DIR) ; tar cf - --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics --exclude "[12]?.ogg" * | ( cd $(DESTDIR)/$(pkgdatadir)/$(PACKAGE_DATA_DIR) ; tar xf -) ; cd .. ; \ + cd $(srcdir)/$(PACKAGE_DATA_DIR) ; tar cf - --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics --exclude "1[1-9].ogg" --exclude "2?.ogg" * | ( cd $(DESTDIR)/$(pkgdatadir)/$(PACKAGE_DATA_DIR) ; tar xf -) ; cd .. ; \ fi dist-hook: diff --git a/boards/geography/africa/angola.png b/boards/geography/africa/angola.png Binary files differindex 319de99..98e7438 100644 --- a/boards/geography/africa/angola.png +++ b/boards/geography/africa/angola.png diff --git a/boards/geography/africa/eritrea.png b/boards/geography/africa/eritrea.png Binary files differnew file mode 100644 index 0000000..6029dda --- /dev/null +++ b/boards/geography/africa/eritrea.png diff --git a/boards/geography/africa/ethiopia.png b/boards/geography/africa/ethiopia.png Binary files differindex 1cb87b7..3853af1 100644 --- a/boards/geography/africa/ethiopia.png +++ b/boards/geography/africa/ethiopia.png diff --git a/boards/geography/africa/north_africa.png b/boards/geography/africa/north_africa.png Binary files differindex 9dd7411..350b5e2 100644 --- a/boards/geography/africa/north_africa.png +++ b/boards/geography/africa/north_africa.png diff --git a/boards/geography/africa/north_africa.xcf b/boards/geography/africa/north_africa.xcf Binary files differdeleted file mode 100644 index d738c66..0000000 --- a/boards/geography/africa/north_africa.xcf +++ /dev/null diff --git a/boards/geography/africa/sudan.png b/boards/geography/africa/sudan.png Binary files differindex 358161f..48a0bac 100644 --- a/boards/geography/africa/sudan.png +++ b/boards/geography/africa/sudan.png diff --git a/boards/geography/afrique/africa.png b/boards/geography/afrique/africa.png Binary files differindex b3411d2..e2d97c3 100644 --- a/boards/geography/afrique/africa.png +++ b/boards/geography/afrique/africa.png diff --git a/boards/geography/afrique/burundi.png b/boards/geography/afrique/burundi.png Binary files differdeleted file mode 100644 index 0b14e90..0000000 --- a/boards/geography/afrique/burundi.png +++ /dev/null diff --git a/boards/geography/afrique/djibouti.png b/boards/geography/afrique/djibouti.png Binary files differdeleted file mode 100644 index a73ebac..0000000 --- a/boards/geography/afrique/djibouti.png +++ /dev/null diff --git a/boards/geography/afrique/equatorial_guinea.png b/boards/geography/afrique/equatorial_guinea.png Binary files differdeleted file mode 100644 index fa09139..0000000 --- a/boards/geography/afrique/equatorial_guinea.png +++ /dev/null diff --git a/boards/geography/afrique/gambia.png b/boards/geography/afrique/gambia.png Binary files differdeleted file mode 100644 index 8b0a66a..0000000 --- a/boards/geography/afrique/gambia.png +++ /dev/null diff --git a/boards/geography/afrique/guinea_bissau.png b/boards/geography/afrique/guinea_bissau.png Binary files differdeleted file mode 100644 index 2b4dd8c..0000000 --- a/boards/geography/afrique/guinea_bissau.png +++ /dev/null diff --git a/boards/geography/afrique/lesotho.png b/boards/geography/afrique/lesotho.png Binary files differdeleted file mode 100644 index 0858e51..0000000 --- a/boards/geography/afrique/lesotho.png +++ /dev/null diff --git a/boards/geography/afrique/rwanda.png b/boards/geography/afrique/rwanda.png Binary files differdeleted file mode 100644 index 51237c3..0000000 --- a/boards/geography/afrique/rwanda.png +++ /dev/null diff --git a/boards/geography/afrique/sierra_leone.png b/boards/geography/afrique/sierra_leone.png Binary files differdeleted file mode 100644 index 0e0e8a9..0000000 --- a/boards/geography/afrique/sierra_leone.png +++ /dev/null diff --git a/boards/geography/afrique/swaziland.png b/boards/geography/afrique/swaziland.png Binary files differdeleted file mode 100644 index 6a0011a..0000000 --- a/boards/geography/afrique/swaziland.png +++ /dev/null diff --git a/boards/geography/board4_0.xml.in b/boards/geography/board4_0.xml.in index 452c659..9279c7d 100644 --- a/boards/geography/board4_0.xml.in +++ b/boards/geography/board4_0.xml.in @@ -41,10 +41,14 @@ <_tooltip>Equatorial Guinea</_tooltip> </Shape> -<Shape name="J" pixmapfile="geography/africa/ethiopia.png" sound="sounds/$LOCALE/geography/africa/ethiopia.ogg" x="662" y="338" position="0"> +<Shape name="J" pixmapfile="geography/africa/ethiopia.png" sound="sounds/$LOCALE/geography/africa/ethiopia.ogg" x="662" y="356" position="0"> <_tooltip>Ethiopia</_tooltip> </Shape> +<Shape name="erytrea" pixmapfile="geography/africa/eritrea.png" sound="sounds/$LOCALE/geography/eritrea.ogg" x="655" y="293" zoomx="1" zoomy="1" position="0"> +<_tooltip>Eritrea</_tooltip> +</Shape> + <Shape name="K" pixmapfile="geography/africa/gabon.png" sound="sounds/$LOCALE/geography/africa/gabon.ogg" x="388" y="462" position="0"> <_tooltip>Gabon</_tooltip> </Shape> diff --git a/boards/geography/board4_2.xml.in b/boards/geography/board4_2.xml.in index c011231..1dffee9 100644 --- a/boards/geography/board4_2.xml.in +++ b/boards/geography/board4_2.xml.in @@ -20,9 +20,6 @@ <Shape name="burkina" pixmapfile="geography/afrique/burkina.png" sound="sounds/$LOCALE/geography/burkina.ogg" x="366" y="184" zoomx="1" zoomy="1" position="0"> <_tooltip>Burkina Faso</_tooltip> </Shape> -<Shape name="burundi" pixmapfile="geography/afrique/burundi.png" sound="sounds/$LOCALE/geography/burundi.ogg" x="561" y="295" zoomx="1" zoomy="1" position="0"> -<_tooltip>Burundi</_tooltip> -</Shape> <Shape name="cameroon" pixmapfile="geography/afrique/cameroon.png" sound="sounds/$LOCALE/geography/cameroon.ogg" x="455" y="223" zoomx="1" zoomy="1" position="0"> <_tooltip>Cameroon</_tooltip> </Shape> @@ -32,9 +29,6 @@ <Shape name="cote_ivoire" pixmapfile="geography/afrique/ivory_coast.png" sound="sounds/$LOCALE/geography/ivory_coast.ogg" x="343" y="218" zoomx="1" zoomy="1" position="0"> <_tooltip>Ivory Coast</_tooltip> </Shape> -<Shape name="djibouti" pixmapfile="geography/afrique/djibouti.png" sound="sounds/$LOCALE/geography/djibouti.ogg" x="637" y="185" zoomx="1" zoomy="1" position="0"> -<_tooltip>Djibouti</_tooltip> -</Shape> <Shape name="egypte" pixmapfile="geography/afrique/egypt.png" sound="sounds/$LOCALE/geography/egypt.ogg" x="558" y="84" zoomx="1" zoomy="1" position="0"> <_tooltip>Egypt</_tooltip> </Shape> @@ -47,31 +41,19 @@ <Shape name="gabon" pixmapfile="geography/afrique/gabon.png" sound="sounds/$LOCALE/geography/gabon.ogg" x="449" y="279" zoomx="1" zoomy="1" position="0"> <_tooltip>Gabon</_tooltip> </Shape> -<Shape name="gambie" pixmapfile="geography/afrique/gambia.png" sound="sounds/$LOCALE/geography/gambia.ogg" x="283" y="176" zoomx="1" zoomy="1" position="0"> -<_tooltip>Gambia</_tooltip> -</Shape> <Shape name="ghana" pixmapfile="geography/afrique/ghana.png" sound="sounds/$LOCALE/geography/ghana.ogg" x="368" y="215" zoomx="1" zoomy="1" position="0"> <_tooltip>Ghana</_tooltip> </Shape> -<Shape name="guinee" pixmapfile="geography/afrique/guinee.png" sound="sounds/$LOCALE/geography/guinee.ogg" x="307" y="200" zoomx="1" zoomy="1" position="0"> +<Shape name="guinee" pixmapfile="geography/afrique/guinea.png" sound="sounds/$LOCALE/geography/guinee.ogg" x="307" y="200" zoomx="1" zoomy="1" position="0"> <_tooltip>Guinea</_tooltip> </Shape> -<Shape name="guinee_bissau" pixmapfile="geography/afrique/guinea_bissau.png" sound="sounds/$LOCALE/geography/guinea_bissau.ogg" x="283" y="188" zoomx="1" zoomy="1" position="0"> -<_tooltip>Guinea Bissau</_tooltip> -</Shape> -<Shape name="guinee_equat" pixmapfile="geography/afrique/equatorial_guinea.png" sound="sounds/$LOCALE/geography/equatorial_guinea.ogg" x="441" y="260" zoomx="1" zoomy="1" position="0"> -<_tooltip>Equatorial Guinea</_tooltip> -</Shape> <Shape name="kenya" pixmapfile="geography/afrique/kenya.png" sound="sounds/$LOCALE/geography/kenya.ogg" x="612" y="270" zoomx="1" zoomy="1" position="0"> <_tooltip>Kenya</_tooltip> </Shape> -<Shape name="lesotho" pixmapfile="geography/afrique/lesotho.png" sound="sounds/$LOCALE/geography/lesotho.ogg" x="545" y="478" zoomx="1" zoomy="1" position="0"> -<_tooltip>Lesotho</_tooltip> -</Shape> <Shape name="liberia" pixmapfile="geography/afrique/liberia.png" sound="sounds/$LOCALE/geography/liberia.ogg" x="317" y="226" zoomx="1" zoomy="1" position="0"> <_tooltip>Liberia</_tooltip> </Shape> -<Shape name="libye" pixmapfile="geography/afrique/libye.png" sound="sounds/$LOCALE/geography/libya.ogg" x="481" y="85" zoomx="1" zoomy="1" position="0"> +<Shape name="libye" pixmapfile="geography/afrique/libya.png" sound="sounds/$LOCALE/geography/libya.ogg" x="481" y="85" zoomx="1" zoomy="1" position="0"> <_tooltip>Libya</_tooltip> </Shape> <Shape name="madagascar" pixmapfile="geography/afrique/madagascar.png" sound="sounds/$LOCALE/geography/madagascar.ogg" x="662" y="402" zoomx="1" zoomy="1" position="0"> @@ -83,7 +65,7 @@ <Shape name="mali" pixmapfile="geography/afrique/mali.png" sound="sounds/$LOCALE/geography/mali.ogg" x="352" y="145" zoomx="1" zoomy="1" position="0"> <_tooltip>Mali</_tooltip> </Shape> -<Shape name="maroc" pixmapfile="geography/afrique/maroc.png" sound="sounds/$LOCALE/geography/moroco.ogg" x="321" y="69" zoomx="1" zoomy="1" position="0"> +<Shape name="maroc" pixmapfile="geography/afrique/moroco.png" sound="sounds/$LOCALE/geography/moroco.ogg" x="321" y="69" zoomx="1" zoomy="1" position="0"> <_tooltip>Morocco</_tooltip> </Shape> <Shape name="mauritanie" pixmapfile="geography/afrique/mauritania.png" sound="sounds/$LOCALE/geography/mauritania.ogg" x="309" y="124" zoomx="1" zoomy="1" position="0"> @@ -92,7 +74,7 @@ <Shape name="mozambique" pixmapfile="geography/afrique/mozambique.png" sound="sounds/$LOCALE/geography/mozambique.ogg" x="594" y="403" zoomx="1" zoomy="1" position="0"> <_tooltip>Mozambique</_tooltip> </Shape> -<Shape name="namibie" pixmapfile="geography/afrique/namibie.png" sound="sounds/$LOCALE/geography/namibia.ogg" x="487" y="432" zoomx="1" zoomy="1" position="0"> +<Shape name="namibie" pixmapfile="geography/afrique/namibia.png" sound="sounds/$LOCALE/geography/namibia.ogg" x="487" y="432" zoomx="1" zoomy="1" position="0"> <_tooltip>Namibia</_tooltip> </Shape> <Shape name="niger" pixmapfile="geography/afrique/niger.png" sound="sounds/$LOCALE/geography/niger.ogg" x="426" y="147" zoomx="1" zoomy="1" position="0"> @@ -110,20 +92,14 @@ <Shape name="rep_congo" pixmapfile="geography/afrique/rep_congo.png" sound="sounds/$LOCALE/geography/democratic_republic_of_congo.ogg" x="510" y="299" zoomx="1" zoomy="1" position="0"> <_tooltip>Democratic Republic of Congo</_tooltip> </Shape> -<Shape name="rwanda" pixmapfile="geography/afrique/rwanda.png" sound="sounds/$LOCALE/geography/rwanda.ogg" x="562" y="284" zoomx="1" zoomy="1" position="0"> -<_tooltip>Rwanda</_tooltip> -</Shape> <Shape name="senegal" pixmapfile="geography/afrique/senegal.png" sound="sounds/$LOCALE/geography/senegal.ogg" x="288" y="169" zoomx="1" zoomy="1" position="0"> <_tooltip>Senegal</_tooltip> </Shape> -<Shape name="sierra_leone" pixmapfile="geography/afrique/sierra_leone.png" sound="sounds/$LOCALE/geography/sierra_leone.ogg" x="303" y="211" zoomx="1" zoomy="1" position="0"> -<_tooltip>Sierra Leone</_tooltip> -</Shape> <Shape name="somalie" pixmapfile="geography/afrique/somalia.png" sound="sounds/$LOCALE/geography/somalia.ogg" x="661" y="234" zoomx="1" zoomy="1" position="0"> <_tooltip>Somalia</_tooltip> </Shape> -<Shape name="mali" pixmapfile="geography/afrique/mali.png" sound="sounds/$LOCALE/geography/mali.ogg" x="561" y="179" zoomx="1" zoomy="1" position="0"> -<_tooltip>Mali</_tooltip> +<Shape name="soudan" pixmapfile="geography/afrique/soudan.png" sound="sounds/$LOCALE/geography/soudan.ogg" x="561" y="179" zoomx="1" zoomy="1" position="0"> +<_tooltip>Soudan</_tooltip> </Shape> <Shape name="tanzanie" pixmapfile="geography/afrique/tanzania.png" sound="sounds/$LOCALE/geography/tanzania.ogg" x="592" y="315" zoomx="1" zoomy="1" position="0"> <_tooltip>Tanzania</_tooltip> @@ -143,7 +119,4 @@ <Shape name="zimbabwe" pixmapfile="geography/afrique/zimbabwe.png" sound="sounds/$LOCALE/geography/zimbabwe.ogg" x="555" y="403" zoomx="1" zoomy="1" position="0"> <_tooltip>Zimbabwe</_tooltip> </Shape> -<Shape name="zwaziland" pixmapfile="geography/afrique/swaziland.png" sound="sounds/$LOCALE/geography/swaziland.ogg" x="565" y="455" zoomx="1" zoomy="1" position="0"> -<_tooltip>Swaziland</_tooltip> -</Shape> <Shape name="zz" zoomx="1" zoomy="1" y="260" x="480" type="SHAPE_BACKGROUND" position="0" pixmapfile="geography/afrique/africa.png"/></ShapeGame> diff --git a/configure.in b/configure.in index d2aec6d..404df2e 100644 --- a/configure.in +++ b/configure.in @@ -141,9 +141,9 @@ AC_ARG_ENABLE(debug, USE_DEBUG="$enableval", USE_DEBUG="no") if test "x$USE_DEBUG" == "xyes" ; then AC_DEFINE_UNQUOTED(DEBUG, 1, "Enable debug messages.") - CFLAGS="$CFLAGS -Wall -g" + CFLAGS="$CFLAGS -Wall -Werror -g" else - CFLAGS="$CFLAGS -Wall" + CFLAGS="$CFLAGS -Wall -Werror" fi dnl WIN32 Specifics diff --git a/src/boards/Makefile.am b/src/boards/Makefile.am index 52192b6..8ea4217 100644 --- a/src/boards/Makefile.am +++ b/src/boards/Makefile.am @@ -265,6 +265,7 @@ libwordprocessor_la_SOURCES = wordprocessor.c libpython_la_LDFLAGS = -export-dynamic -module -avoid-version $(PYTHON_LIBS) libpython_la_LIBADD = $(top_builddir)/src/gcompris/libgcompris-1.la +libpython_la_CFLAGS = -fno-strict-aliasing libpython_la_SOURCES = python.c \ py-gcompris-board.c py-gcompris-board.h \ py-gcompris-properties.c py-gcompris-properties.h \ diff --git a/src/boards/advanced_colors.c b/src/boards/advanced_colors.c index ec33d07..74ea6e5 100644 --- a/src/boards/advanced_colors.c +++ b/src/boards/advanced_colors.c @@ -459,7 +459,6 @@ static void init_xml() static void add_xml_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child) { char *text = NULL; - char * tmp = NULL; char *sColor = NULL; int color = 0; int i; @@ -470,21 +469,21 @@ static void add_xml_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child) xmlnode = xmlnode->next; while (xmlnode != NULL) { - if (!strcmp(xmlnode->name, "pixmapfile")) - backgroundFile = xmlNodeListGetString(doc, xmlnode->xmlChildrenNode, 1); + if (!strcmp((char *)xmlnode->name, "pixmapfile")) + backgroundFile = (char *)xmlNodeListGetString(doc, xmlnode->xmlChildrenNode, 1); - lang = xmlGetProp(xmlnode,"lang"); + lang = (char *)xmlGetProp(xmlnode, BAD_CAST "lang"); // try to match color[i] for (i=0; i<8; i++) { sColor = g_strdup_printf("color%d", i+1); - if (!strcmp(xmlnode->name, sColor)) { + if (!strcmp((char *)xmlnode->name, sColor)) { if (lang == NULL) { // get default value - text = xmlNodeListGetString(doc, xmlnode->xmlChildrenNode, 1); + text = (char *)xmlNodeListGetString(doc, xmlnode->xmlChildrenNode, 1); colors[i] = text; } else { // get correct language if ( !strncmp(lang, gcompris_get_locale(), strlen(lang)) ) { - text = xmlNodeListGetString(doc, xmlnode->xmlChildrenNode, 1); + text = (char *)xmlNodeListGetString(doc, xmlnode->xmlChildrenNode, 1); g_warning("color prop::lang=%s locale=%s text=%s\n", lang, gcompris_get_locale(), text); colors[i] = text; } @@ -514,7 +513,7 @@ static void parse_doc(xmlDocPtr doc) xmlNodePtr node; for(node = doc->children->children; node != NULL; node = node->next) { - if ( g_strcasecmp(node->name, "Board") == 0 ) + if ( g_strcasecmp((char *)node->name, "Board") == 0 ) add_xml_data(doc, node,NULL); } @@ -548,7 +547,7 @@ static gboolean read_xml_file(char *fname) /* if it doesn't have a name */ !doc->children->name || /* if it isn't a ImageId node */ - g_strcasecmp(doc->children->name,"AdvancedColors")!=0) { + g_strcasecmp((char *)doc->children->name,"AdvancedColors")!=0) { xmlFreeDoc(doc); return FALSE; } diff --git a/src/boards/algebra.c b/src/boards/algebra.c index 040eedd..ddb9416 100644 --- a/src/boards/algebra.c +++ b/src/boards/algebra.c @@ -1,6 +1,6 @@ /* gcompris - algebra.c * - * Time-stamp: <2006/03/02 00:38:14 bruno> + * Time-stamp: <2006/08/12 02:45:08 bruno> * * Copyright (C) 2000 Bruno Coudoin * @@ -578,19 +578,19 @@ static GnomeCanvasItem *algebra_create_item(GnomeCanvasGroup *parent) { case PLUSSIGNFILE: expected_result = g_strdup_printf("%d", first_operand+second_operand); - audioOperand = "plus"; + audioOperand = "sounds/$LOCALE/misc/plus.ogg"; break; case MINUSSIGNFILE: expected_result = g_strdup_printf("%d", first_operand-second_operand); - audioOperand = "minus"; + audioOperand = "sounds/$LOCALE/misc/minus.ogg"; break; case BYSIGNFILE: expected_result = g_strdup_printf("%d", first_operand*second_operand); - audioOperand = "by"; + audioOperand = "sounds/$LOCALE/misc/by.ogg"; break; case DIVIDESIGNFILE: expected_result = g_strdup_printf("%d", first_operand/second_operand); - audioOperand = "outof"; + audioOperand = "sounds/$LOCALE/misc/outof.ogg"; break; default: g_error("Bad Operation"); @@ -600,11 +600,34 @@ static GnomeCanvasItem *algebra_create_item(GnomeCanvasGroup *parent) y_firstline, expected_result, TRUE); - gcompris_play_ogg(first_operand_str, audioOperand , second_operand_str, "equal", NULL); + { + gchar *str1 = NULL; + gchar *str2 = NULL; - g_free(first_operand_str); - g_free(second_operand_str); + if(strlen(first_operand_str)==1) + str1 = gcompris_alphabet_sound(first_operand_str); + else + str1 = g_strdup_printf("%s.ogg", first_operand_str); + if(strlen(second_operand_str)==1) + str2 = gcompris_alphabet_sound(second_operand_str); + else + str2 = g_strdup_printf("%s.ogg", second_operand_str); + + g_free(first_operand_str); + g_free(second_operand_str); + + first_operand_str = g_strdup_printf("sounds/$LOCALE/alphabet/%s", str1); + second_operand_str = g_strdup_printf("sounds/$LOCALE/alphabet/%s", str2); + + gcompris_play_ogg(first_operand_str, audioOperand , second_operand_str, "sounds/$LOCALE/misc/equal.ogg", NULL); + + g_free(str1); + g_free(str2); + + g_free(first_operand_str); + g_free(second_operand_str); + } return (item); } @@ -685,7 +708,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data) currentToBeFoundItem=toBeFoundItem; - gcompris_play_ogg ("gobble", NULL); + gcompris_play_ogg ("sounds/gobble", NULL); break; default: diff --git a/src/boards/chess.c b/src/boards/chess.c index bf25db0..323c34b 100644 --- a/src/boards/chess.c +++ b/src/boards/chess.c @@ -61,7 +61,6 @@ static gboolean engine_local_err_cb (GIOChannel *source, gpointer data); static void display_white_turn (gboolean whiteturn); static void display_info (gchar *info); -static int get_square (double x, double y); static int get_square_from_coord (double x, double y); #define CHESSBOARD_X 50 @@ -725,18 +724,6 @@ static void move_piece_to(Square from, Square to) * Return a square suitable for position functions */ static int -get_square (double x, double y) -{ - - return (A1 + (Square) (x-1) - + 10 * (Square)(y-1)); - -} - -/* - * Return a square suitable for position functions - */ -static int get_square_from_coord (double x, double y) { @@ -985,9 +972,16 @@ engine_local_cb (GIOChannel *source, static char *b=buf; char *p,*q; - ssize_t len; - - g_io_channel_read (read_chan, b, sizeof (buf) - 1 - (b - buf), &len); + gsize len; + GIOStatus status; + + status = g_io_channel_read_chars (read_chan, b, sizeof (buf) - 1 - (b - buf), &len, NULL); + if(status != G_IO_STATUS_NORMAL) + { + g_warning("g_io_channel_read_chars status=%d\n", status); + /* FIXME: Not sure what to do */ + return FALSE; + } if (len > 0) { b[len] = 0; @@ -1130,17 +1124,25 @@ start_child (char *cmd, *read_chan = g_io_channel_unix_new (Child_Out); *write_chan = g_io_channel_unix_new (Child_In); + if(g_io_channel_set_encoding(*write_chan, NULL, NULL) != G_IO_STATUS_NORMAL) + g_warning("Failed to set NULL encoding"); + + if(g_io_channel_set_flags (*read_chan, G_IO_FLAG_SET_MASK, NULL) != G_IO_STATUS_NORMAL) + g_warning("Failed to set NON BLOCKING IO"); + + if(g_io_channel_set_flags (*write_chan, G_IO_FLAG_SET_MASK, NULL) != G_IO_STATUS_NORMAL) + g_warning("Failed to set NON BLOCKING IO"); + return(TRUE); } - static void write_child (GIOChannel *write_chan, char *format, ...) { GIOError err; va_list ap; char *buf; - int len; + gsize len; va_start (ap, format); @@ -1149,11 +1151,38 @@ write_child (GIOChannel *write_chan, char *format, ...) err = g_io_channel_write (write_chan, buf, strlen (buf), &len); if (err != G_IO_ERROR_NONE) g_warning ("Writing to child process failed"); - - g_warning ("%s", buf); + else + g_warning ("Wrote '%s' to gnuchess", buf); va_end (ap); g_free (buf); } +/* FIXME: The new API bellow should be use but for an unknown reason it doesn't work, + * Not all data are read back using this method + */ +/* +static void +write_child (GIOChannel *write_chan, char *format, ...) +{ + GIOStatus err; + va_list ap; + gchar *buf; + gsize len; + + va_start (ap, format); + + buf = g_strdup_vprintf (format, ap); + + err = g_io_channel_write_chars (write_chan, buf, strlen (buf), &len, NULL); + if (err != G_IO_STATUS_NORMAL) + g_warning ("Writing to child process failed"); + else + g_warning ("Wrote '%s' to gnuchess", buf); + + va_end (ap); + + g_free (buf); +} +*/ diff --git a/src/boards/chess_position.c b/src/boards/chess_position.c index d1f719e..c56dae7 100644 --- a/src/boards/chess_position.c +++ b/src/boards/chess_position.c @@ -93,7 +93,7 @@ class_init (PositionClass *class) object_class = (GtkObjectClass*) class; - //2 object_class->finalize = finalize; + object_class->destroy = finalize; } static void diff --git a/src/boards/click_on_letter.c b/src/boards/click_on_letter.c index 1be2aea..a21366c 100644 --- a/src/boards/click_on_letter.c +++ b/src/boards/click_on_letter.c @@ -254,7 +254,6 @@ static void repeat () static gboolean sounds_are_fine() { char *letter_str; - char *str1; char *str2; GcomprisProperties *properties = gcompris_get_properties(); @@ -327,6 +326,7 @@ click_on_letter_next_level() gcompris_score_set(gcomprisBoard->sublevel); g_free (right_letter); /* Try the next level */ + gcompris_play_ogg("sounds/$LOCALE/misc/click_on_letter.ogg", NULL); click_on_letter_create_item(gnome_canvas_root(gcomprisBoard->canvas)); } /* ==================================== */ diff --git a/src/boards/colors.c b/src/boards/colors.c index bf82604..025c7b3 100644 --- a/src/boards/colors.c +++ b/src/boards/colors.c @@ -107,9 +107,9 @@ GET_BPLUGIN_INFO(colors) static GcomprisProfile *profile_conf; static GcomprisBoard *board_conf; -static GHFunc save_table (gpointer key, - gpointer value, - gpointer user_data) +static void save_table (gpointer key, + gpointer value, + gpointer user_data) { gcompris_set_board_conf ( profile_conf, board_conf, @@ -151,12 +151,6 @@ conf_ok(GHashTable *table) profile_conf = NULL; } -static gboolean check_text(gchar *key, gchar *text, GtkLabel *label){ - gtk_label_set_markup(label, text); - - return TRUE; -} - static void colors_config_start(GcomprisBoard *agcomprisBoard, GcomprisProfile *aProfile) diff --git a/src/boards/draw.c b/src/boards/draw.c index 4558ca3..59b897d 100644 --- a/src/boards/draw.c +++ b/src/boards/draw.c @@ -24,8 +24,10 @@ #include <libxml/parser.h> #include <math.h> +#include <string.h> #include "gcompris/gcompris.h" +#include "gcompris/pixbuf_util.h" #define SOUNDLISTFILE PACKAGE #define IMG_DATA_SET PACKAGE_DATA_DIR "/dataset" @@ -190,7 +192,6 @@ static void display_color_selector(GnomeCanvasGroup *parent); static void display_tool_selector(GnomeCanvasGroup *parent); static void display_drawing_area(GnomeCanvasGroup *parent); static void display_grid(gboolean status); -static gint color_event(GnomeCanvasItem *item, GdkEvent *event, gchar *color); static gint ext_color_event(GnomeCanvasItem *item, GdkEvent *event, gpointer color_rgba); static void set_current_tool(GnomeCanvasItem *item, gint tool); static gint tool_event(GnomeCanvasItem *item, GdkEvent *event, gint tool); @@ -201,11 +202,10 @@ static gint item_event_move(GnomeCanvasItem *item, GdkEvent *event, AnchorsItem static void highlight_color_item(GnomeCanvasItem *item); static guint get_tool_cursor(ToolList tool); static guint get_resize_cursor(AnchorType anchor); -static void realign_to_grid(GnomeCanvasItem *item); static void snap_to_grid(double *x, double *y); static void image_selected(gchar *image); -static void load_drawing(gchar *file); -static void save_drawing(gchar *file); +static void load_drawing(gchar *file, gchar *type); +static void save_drawing(gchar *file, gchar *type); /* Description of this plugin */ static BoardPlugin menu_bp = @@ -753,36 +753,6 @@ static void display_grid(gboolean status) } /* - * Given an object, realign it to the grid - * if the grid is on - * FIXME: Does not work yet as expected - */ -static void realign_to_grid(GnomeCanvasItem *item) -{ - - if(grid_step!=0) - { - double x1, y1, x2, y2; - double xsnap1, ysnap1; - - gnome_canvas_item_get_bounds (item, - &x1, - &y1, - &x2, - &y2); - - xsnap1 = x1; - ysnap1 = y1; - snap_to_grid(&xsnap1, &ysnap1); - - // Realign our object on the grid - gnome_canvas_item_move(item, - x1 - xsnap1, - y1 - ysnap1); - } -} - -/* * Given a pair (x,y) rewrite them so that (x,y) is on a grid node * Do nothing if grid_step is 0 */ @@ -1094,7 +1064,6 @@ static void reset_anchors_line(AnchorsItem *anchorsItem) { GnomeCanvasItem *item; double x1, x2, y1, y2; - double x, y; GnomeCanvasPoints *points; item = anchorsItem->item; @@ -2126,7 +2095,7 @@ static void recreate_item(GnomeCanvasItem *item) /** * Callback for the drawing load */ -static void load_drawing(gchar *file) +static void load_drawing(gchar *file, gchar *type) { } @@ -2134,7 +2103,7 @@ static void load_drawing(gchar *file) /** * Callback for the drawing save */ -static void save_drawing(gchar *file) +static void save_drawing(gchar *file, gchar *type) { } diff --git a/src/boards/enumerate.c b/src/boards/enumerate.c index 2191242..fbb9d0f 100644 --- a/src/boards/enumerate.c +++ b/src/boards/enumerate.c @@ -485,11 +485,13 @@ item_event_focus(GnomeCanvasItem *item, GdkEvent *event, guint index) gnome_canvas_item_hide(answer_item_focus[current_focus]); current_focus = index; gnome_canvas_item_show(answer_item_focus[current_focus]); + return TRUE; break; default: break; } + return FALSE; } /* ==================================== */ diff --git a/src/boards/erase.c b/src/boards/erase.c index 0752ea5..f6b804d 100644 --- a/src/boards/erase.c +++ b/src/boards/erase.c @@ -438,7 +438,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data) return FALSE; if (event->type == GDK_MOTION_NOTIFY) - return; + return FALSE; if (board_mode == NORMAL) if (event->type != GDK_ENTER_NOTIFY) diff --git a/src/boards/fifteen.c b/src/boards/fifteen.c index b2d4fc4..9ee87e0 100644 --- a/src/boards/fifteen.c +++ b/src/boards/fifteen.c @@ -47,8 +47,6 @@ static gint piece_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data static void scramble (GnomeCanvasItem **board, guint number_of_scrambles); static char *get_piece_color (int piece); -static int number_of_scrambles = 0; - /* Description of this plugin */ static BoardPlugin menu_bp = { @@ -362,7 +360,7 @@ piece_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data) double dx = 0.0, dy = 0.0; int move; - canvas = GNOME_CANVAS_GROUP(item->parent); + canvas = GNOME_CANVAS(item->parent); board = g_object_get_data (G_OBJECT (canvas), "board"); num = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "piece_num")); pos = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "piece_pos")); diff --git a/src/boards/gtans.c b/src/boards/gtans.c index 32b7744..7f9fa31 100644 --- a/src/boards/gtans.c +++ b/src/boards/gtans.c @@ -269,7 +269,6 @@ static gboolean dumtabpxpixmode[3],*tabpxpixmode=dumtabpxpixmode-PXSTART; /* mod static gboolean tabcolalloc[GCNBR]; /* couleur allouee ? */ static gchar *userconf=NULL; /* nom complet du fichier de config local */ static gchar *usergtdir=NULL; /* nom du home directory local */ -static guint provmsg=0; /* nr. du dernier msg. provisoire */ static tanflfig flfigpetite; static tanfpnt fpntspetite[FLPNTMAX]; diff --git a/src/boards/gtans_callbacks.c b/src/boards/gtans_callbacks.c index 23cf195..df56ea4 100644 --- a/src/boards/gtans_callbacks.c +++ b/src/boards/gtans_callbacks.c @@ -113,7 +113,6 @@ on_wdrawareagrande_button_press_event (GtkWidget *widget, { int x,y; int piece; - int oldselgr=selectedgrande; if (!selpossible || event->type!=GDK_BUTTON_PRESS) /* double-click ou deja trouve */ return TRUE; @@ -349,10 +348,9 @@ on_rotation_clicked (GnomeCanvasItem *canvasitem, GdkEvent *event, gpointer user_data) { - gint angle; - if ((event->type == GDK_BUTTON_PRESS) && (event->button.button == 1)) { + gint angle = 0; if (selectedgrande==TRUE){ switch ((gint) user_data){ diff --git a/src/boards/hanoi.c b/src/boards/hanoi.c index f4b5237..2eaceb1 100644 --- a/src/boards/hanoi.c +++ b/src/boards/hanoi.c @@ -677,7 +677,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, PieceItem *data) double tmpx, tmpy; PieceItem *piece_src; PieceItem *piece_dst; - gint col, line; + gint col = 0, line; gcompris_canvas_item_ungrab(data->item, event->button.time); dragging = FALSE; diff --git a/src/boards/magic_hat.c b/src/boards/magic_hat.c index 6337e20..5d3cd51 100644 --- a/src/boards/magic_hat.c +++ b/src/boards/magic_hat.c @@ -605,7 +605,6 @@ static void place_item(frame * my_frame, int type) { static gint item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data) { int index = GPOINTER_TO_INT(data); - GdkPixbuf *pixmap; if (board_paused) return FALSE; @@ -616,32 +615,34 @@ static gint item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data) { if ((event->type == GDK_BUTTON_PRESS) && (event->button.button == 1)) { if (frame_player.array_star_type[index / MAX_ITEM][index % MAX_ITEM] >= 0) { + GdkPixbuf *pixmap; - // Desactivate the star - frame_player.nb_stars[index / MAX_ITEM]--; - frame_player.array_star_type[index / MAX_ITEM][index % MAX_ITEM] = -1; + // Desactivate the star + frame_player.nb_stars[index / MAX_ITEM]--; + frame_player.array_star_type[index / MAX_ITEM][index % MAX_ITEM] = -1; - pixmap = gcompris_load_pixmap("magic_hat/star-clear.png"); + pixmap = gcompris_load_pixmap("magic_hat/star-clear.png"); - gnome_canvas_item_set(item, "pixbuf", pixmap, NULL); + gnome_canvas_item_set(item, "pixbuf", pixmap, NULL); - gdk_pixbuf_unref(pixmap); + gdk_pixbuf_unref(pixmap); } else { + GdkPixbuf *pixmap = NULL; - // Activate the star - frame_player.nb_stars[index / MAX_ITEM]++; - frame_player.array_star_type[index / MAX_ITEM][index % MAX_ITEM] = index / MAX_ITEM; + // Activate the star + frame_player.nb_stars[index / MAX_ITEM]++; + frame_player.array_star_type[index / MAX_ITEM][index % MAX_ITEM] = index / MAX_ITEM; - switch(index / MAX_ITEM) - { - case 0: pixmap = gcompris_load_pixmap("magic_hat/star1.png"); break; - case 1: pixmap = gcompris_load_pixmap("magic_hat/star2.png"); break; - case 2: pixmap = gcompris_load_pixmap("magic_hat/star3.png"); break; - } - gnome_canvas_item_set(item, "pixbuf", pixmap, NULL); + switch(index / MAX_ITEM) + { + case 0: pixmap = gcompris_load_pixmap("magic_hat/star1.png"); break; + case 1: pixmap = gcompris_load_pixmap("magic_hat/star2.png"); break; + case 2: pixmap = gcompris_load_pixmap("magic_hat/star3.png"); break; + } + gnome_canvas_item_set(item, "pixbuf", pixmap, NULL); - gdk_pixbuf_unref(pixmap); + gdk_pixbuf_unref(pixmap); } gcompris_play_ogg ("gobble", NULL); } diff --git a/src/boards/menu2.c b/src/boards/menu2.c index eaba397..4850d52 100644 --- a/src/boards/menu2.c +++ b/src/boards/menu2.c @@ -1,6 +1,6 @@ /* gcompris - menu2.c * - * Time-stamp: <2006/05/08 02:05:59 bruno> + * Time-stamp: <2006/08/11 18:58:38 bruno> * * Copyright (C) 2000 Bruno Coudoin * @@ -24,6 +24,8 @@ * * Seen from gcompris, the menu is a board like another. */ +#include <string.h> + #include "gcompris/gcompris.h" #include "gcompris/gcompris_config.h" @@ -573,8 +575,6 @@ static gint item_event(GnomeCanvasItem *item, GdkEvent *event, MenuItems *menuitems) { GcomprisBoard *board; - GdkPixbuf *pixmap; - if(board_paused) return FALSE; diff --git a/src/boards/money.c b/src/boards/money.c index b879b91..d2fb44f 100644 --- a/src/boards/money.c +++ b/src/boards/money.c @@ -203,8 +203,8 @@ gboolean is_our_board (GcomprisBoard *gcomprisBoard) static void money_next_level() { GdkPixbuf *pixmap = NULL; - guint min_price, max_price; - guint number_of_item; + guint min_price = 0, max_price = 0; + guint number_of_item = 0; guint i; gchar *display_format; gchar *img; diff --git a/src/boards/money_widget.c b/src/boards/money_widget.c index e9299da..e9b2ea9 100644 --- a/src/boards/money_widget.c +++ b/src/boards/money_widget.c @@ -232,11 +232,6 @@ static void money_display_total(Money_Widget *moneyWidget) } -static void -money_widget_move (Money_Widget *moneyWidget, MoneyItem *moneyItem) -{ -} - void money_widget_add (Money_Widget *moneyWidget, MoneyEuroType value) { @@ -328,7 +323,8 @@ money_widget_remove(Money_Widget *moneyWidget, MoneyEuroType value) double money_widget_get_total (Money_Widget *moneyWidget) { - g_return_if_fail (moneyWidget != NULL); + if(moneyWidget == NULL) + return 0; return moneyWidget->priv->total; } diff --git a/src/boards/planegame.c b/src/boards/planegame.c index d536777..61ed05d 100644 --- a/src/boards/planegame.c +++ b/src/boards/planegame.c @@ -1,6 +1,6 @@ /* gcompris - planegame.c * - * Time-stamp: <2005/10/15 16:54:30 bruno> + * Time-stamp: <2006/08/11 19:02:09 bruno> * * Copyright (C) 2000 Bruno Coudoin * @@ -46,9 +46,6 @@ typedef struct { } CloudItem; -/* default gnome pixmap directory in which this game tales the icon */ -static char *pixmapsdir = "gcompris/misc/"; - static void start_board (GcomprisBoard *agcomprisBoard); static void pause_board (gboolean pause); static void end_board (void); diff --git a/src/boards/py-gcompris-class.c b/src/boards/py-gcompris-class.c index abdc625..d197702 100644 --- a/src/boards/py-gcompris-class.c +++ b/src/boards/py-gcompris-class.c @@ -80,8 +80,6 @@ pyGcomprisClassType_getattr(pyGcomprisClassObject *self, char *name) static int pyGcomprisClassType_setattr(pyGcomprisClassObject *self, char *name, PyObject *v) { - int value; - if (self->cdata==NULL) return -1; if (v==NULL) return -1; diff --git a/src/boards/py-gcompris-group.c b/src/boards/py-gcompris-group.c index 5436d24..3c631ea 100644 --- a/src/boards/py-gcompris-group.c +++ b/src/boards/py-gcompris-group.c @@ -69,8 +69,6 @@ pyGcomprisGroupType_getattr(pyGcomprisGroupObject *self, char *name) static int pyGcomprisGroupType_setattr(pyGcomprisGroupObject *self, char *name, PyObject *v) { - int value; - if (self->cdata==NULL) return -1; if (v==NULL) return -1; diff --git a/src/boards/py-gcompris-profile.c b/src/boards/py-gcompris-profile.c index 48f1135..5d210a4 100644 --- a/src/boards/py-gcompris-profile.c +++ b/src/boards/py-gcompris-profile.c @@ -84,8 +84,6 @@ pyGcomprisProfileType_getattr(pyGcomprisProfileObject *self, char *name) static int pyGcomprisProfileType_setattr(pyGcomprisProfileObject *self, char *name, PyObject *v) { - int value; - if (self->cdata==NULL) return -1; if (v==NULL) return -1; diff --git a/src/boards/py-gcompris-properties.c b/src/boards/py-gcompris-properties.c index 99873b1..801b92d 100644 --- a/src/boards/py-gcompris-properties.c +++ b/src/boards/py-gcompris-properties.c @@ -168,8 +168,6 @@ pyGcomprisPropertiesType_getattr(pyGcomprisPropertiesObject *self, char *name) static int pyGcomprisPropertiesType_setattr(pyGcomprisPropertiesObject *self, char *name, PyObject *v) { - int value; - if (self->cdata==NULL) return -1; if (v==NULL) return -1; diff --git a/src/boards/py-gcompris-user.c b/src/boards/py-gcompris-user.c index c7d09eb..0c8b45a 100644 --- a/src/boards/py-gcompris-user.c +++ b/src/boards/py-gcompris-user.c @@ -63,8 +63,6 @@ pyGcomprisUserType_getattr(pyGcomprisUserObject *self, char *name) static int pyGcomprisUserType_setattr(pyGcomprisUserObject *self, char *name, PyObject *v) { - int value; - if (self->cdata==NULL) return -1; if (v==NULL) return -1; diff --git a/src/boards/py-mod-gcompris.c b/src/boards/py-mod-gcompris.c index d9820eb..b79deb2 100644 --- a/src/boards/py-mod-gcompris.c +++ b/src/boards/py-mod-gcompris.c @@ -1055,7 +1055,7 @@ py_gcompris_set_board_conf (PyObject* self, PyObject* args) /* Some functions and variables needed to get the file selector working */ static PyObject* pyGcomprisConfCallbackFunc = NULL; -static GcomprisConfCallback pyGcomprisConfCallback(GHashTable* table){ +static void pyGcomprisConfCallback(GHashTable* table){ PyObject* result; PyGILState_STATE gil; @@ -1647,8 +1647,8 @@ static PyMethodDef PythonGcomprisModule[] = { { "get_database", py_gcompris_get_database, METH_VARARGS, "gcompris_get_database" }, { "get_properties", py_gcompris_get_properties, METH_VARARGS, "gcompris_get_properties" }, { "get_board_from_section", py_gcompris_get_board_from_section, METH_VARARGS, "gcompris_get_board_from_section" }, - { "spawn_async", py_gcompris_spawn_async, METH_VARARGS|METH_KEYWORDS, "gcompris_spawn_sync" }, - { "child_watch_add", py_gcompris_child_watch_add, METH_VARARGS|METH_KEYWORDS, "gcompris_child_watch_add" }, + { "spawn_async", (PyCFunction)py_gcompris_spawn_async, METH_VARARGS|METH_KEYWORDS, "gcompris_spawn_sync" }, + { "child_watch_add", (PyCFunction)py_gcompris_child_watch_add, METH_VARARGS|METH_KEYWORDS, "gcompris_child_watch_add" }, { "get_board_conf", py_gcompris_get_board_conf, METH_VARARGS, "gcompris_get_board_conf" }, { "get_conf", py_gcompris_get_conf, METH_VARARGS, "gcompris_get_conf" }, { "set_board_conf", py_gcompris_set_board_conf, METH_VARARGS, "gcompris_set_board_conf" }, diff --git a/src/boards/py-mod-utils.c b/src/boards/py-mod-utils.c index f4e14d7..bb9af7a 100644 --- a/src/boards/py-mod-utils.c +++ b/src/boards/py-mod-utils.c @@ -319,7 +319,6 @@ py_gcompris_canvas_get_property(PyObject* self, PyObject* args) PyObject* pyitem; GnomeCanvasItem *item; char *property; - char *value; gchar *result; /* Parse arguments */ diff --git a/src/boards/python.c b/src/boards/python.c index d932e71..986ca59 100644 --- a/src/boards/python.c +++ b/src/boards/python.c @@ -119,15 +119,11 @@ pythonboard_init (GcomprisBoard *agcomprisBoard){ gchar* execstr; gchar* userplugindir; - - gboolean has_config = TRUE; char* board_file_name; char* boardclass; gchar *boarddir; PyObject* module_dict; PyObject* py_boardclass; - PyObject* py_boardclass_args; - PyObject* py_config_start; GcomprisProperties *properties = gcompris_get_properties(); diff --git a/src/boards/read_colors.c b/src/boards/read_colors.c index d4ce7c1..8f92e90 100644 --- a/src/boards/read_colors.c +++ b/src/boards/read_colors.c @@ -431,18 +431,18 @@ static void add_xml_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child) while (xmlnode != NULL) { - lang = xmlGetProp(xmlnode,"lang"); + lang = (char *)xmlGetProp(xmlnode, BAD_CAST "lang"); // try to match color[i] for (i=0; i<LAST_COLOR; i++) { sColor = g_strdup_printf("color%d", i+1); - if (!strcmp(xmlnode->name, sColor)) { + if (!strcmp((char *)xmlnode->name, sColor)) { if (lang == NULL) { // get default value - text = xmlNodeListGetString(doc, xmlnode->xmlChildrenNode, 1); + text = (char *)xmlNodeListGetString(doc, xmlnode->xmlChildrenNode, 1); colors[i] = text; } else { // get correct language if ( !strncmp(lang, gcompris_get_locale(), strlen(lang)) ) { - text = xmlNodeListGetString(doc, xmlnode->xmlChildrenNode, 1); + text = (char *)xmlNodeListGetString(doc, xmlnode->xmlChildrenNode, 1); g_warning("color prop::lang=%s locale=%s text=%s\n", lang, gcompris_get_locale(), text); colors[i] = text; } @@ -506,7 +506,7 @@ static gboolean read_xml_file(char *fname) /* if it doesn't have a name */ !doc->children->name || /* if it isn't a ImageId node */ - g_strcasecmp(doc->children->name,"ReadColors")!=0) { + g_strcasecmp((char *)doc->children->name,"ReadColors")!=0) { xmlFreeDoc(doc); return FALSE; } diff --git a/src/boards/reading.c b/src/boards/reading.c index 49b0f66..5864300 100644 --- a/src/boards/reading.c +++ b/src/boards/reading.c @@ -1,6 +1,6 @@ /* gcompris - reading.c * - * Time-stamp: <2006/04/04 00:04:46 bruno> + * Time-stamp: <2006/08/11 18:29:19 bruno> * * Copyright (C) 2000 Bruno Coudoin * @@ -98,7 +98,7 @@ static void reading_config_stop(void); static void player_win(void); static void player_loose(void); static gchar *get_random_word(gboolean); -static gboolean read_wordfile(); +static gboolean read_wordfile(); static GnomeCanvasItem *display_what_to_do(GnomeCanvasGroup *parent); static void ask_ready(gboolean status); static void ask_yes_no(void); @@ -758,9 +758,8 @@ static FILE *get_wordfile(const char *locale) -static gboolean read_wordfile() +static gboolean read_wordfile() { - FILE *wordsfd; gchar *buf; int len; @@ -780,7 +779,7 @@ static gboolean read_wordfile() } words=g_ptr_array_new (); - while (buf=fgets(g_new(gchar,MAXWORDSLENGTH), MAXWORDSLENGTH, wordsfd)) { + while ((buf=fgets(g_new(gchar,MAXWORDSLENGTH), MAXWORDSLENGTH, wordsfd))) { assert(g_utf8_validate(buf,-1,NULL)); //remove \n from end of line @@ -792,6 +791,7 @@ static gboolean read_wordfile() } fclose(wordsfd); + return TRUE; } /* * Return a random word from a set of text file depending on @@ -821,9 +821,9 @@ static gchar *get_random_word(gboolean remove) static GcomprisProfile *profile_conf; static GcomprisBoard *board_conf; -static GHFunc save_table (gpointer key, - gpointer value, - gpointer user_data) +static void save_table (gpointer key, + gpointer value, + gpointer user_data) { gcompris_set_board_conf ( profile_conf, board_conf, @@ -831,7 +831,7 @@ static GHFunc save_table (gpointer key, (gchar *) value); } -static GcomprisConfCallback conf_ok(GHashTable *table) +static void conf_ok(GHashTable *table) { if (!table){ if (gcomprisBoard) diff --git a/src/boards/shapegame.c b/src/boards/shapegame.c index 0190c62..9b67a2a 100644 --- a/src/boards/shapegame.c +++ b/src/boards/shapegame.c @@ -1,6 +1,6 @@ /* gcompris - shapegame.c * - * Time-stamp: <2006/07/15 03:27:12 bruno> + * Time-stamp: <2006/08/11 18:38:23 bruno> * * Copyright (C) 2000 Bruno Coudoin * @@ -24,6 +24,7 @@ #include <libxml/parser.h> #include <math.h> +#include <string.h> #include "gcompris/gcompris.h" @@ -388,7 +389,6 @@ is_our_board (GcomprisBoard *gcomprisBoard) static gint key_press(guint keyval, gchar *commit_str, gchar *preedit_str) { guint c; - gboolean stop = FALSE; if(!gcomprisBoard) return FALSE; @@ -446,7 +446,6 @@ static gint key_press(guint keyval, gchar *commit_str, gchar *preedit_str) if(edit_mode) { GList *list; - Shape *candidateShape = NULL; /* loop through all our shapes */ for(list = shape_list; list != NULL; list = list->next) { @@ -845,7 +844,6 @@ add_shape_to_list_of_shapes(Shape *shape) if(pixmap) { double w, h; - double ratio; Shape *icon_shape; /* Calc a zoom factor so that the shape will fit in the shapelist @@ -1009,7 +1007,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, Shape *shape) { case GDK_ENTER_NOTIFY: if(shape->tooltip && shape->type == SHAPE_ICON) { - gnome_canvas_item_raise_to_top(tooltip_root_item); + gnome_canvas_item_raise_to_top(GNOME_CANVAS_ITEM(tooltip_root_item)); /* WARNING: This should not be needed but if I don't do it, it's not refreshed */ gnome_canvas_item_set(GNOME_CANVAS_ITEM(tooltip_bg_item), "y", 0.0, @@ -1073,7 +1071,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, Shape *shape) char *p = NULL; char *soundfile = g_strdup(shape->soundfile); - while (p = strstr (soundfile, " ")) + while ((p = strstr (soundfile, " "))) { *p='\0'; gcompris_play_ogg(soundfile, NULL); @@ -1646,15 +1644,15 @@ add_xml_shape_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child) if(/* if the node has no name */ !xmlnode->name || /* or if the name is not "Shape" */ - (g_strcasecmp(xmlnode->name,"Shape")!=0 && + ((g_strcasecmp((const char *)xmlnode->name,"Shape")!=0) && /* or if the name is not "Title" */ - g_strcasecmp(xmlnode->name,"Title")!=0 && + (g_strcasecmp((const char *)xmlnode->name,"Title")!=0) && /* or if the name is not "Option" */ - g_strcasecmp(xmlnode->name,"Option")!=0) + (g_strcasecmp((const char *)xmlnode->name,"Option")!=0) ) ) return; - pixmapfile = xmlGetProp(xmlnode,"pixmapfile"); + pixmapfile = (char *)xmlGetProp(xmlnode, BAD_CAST "pixmapfile"); /* if unspecified, make it UNDEFINED */ if(!pixmapfile) { pixmapfile = UNDEFINED; @@ -1667,11 +1665,11 @@ add_xml_shape_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child) } } - targetfile = xmlGetProp(xmlnode,"targetfile"); + targetfile = (char *)xmlGetProp(xmlnode, BAD_CAST "targetfile"); /* if unspecified, make it UNDEFINED */ if(!targetfile) targetfile = UNDEFINED; - soundfile = xmlGetProp(xmlnode,"sound"); + soundfile = (char *)xmlGetProp(xmlnode, BAD_CAST "sound"); /* if unspecified, make it UNDEFINED */ if(!soundfile) soundfile = UNDEFINED; /*********************************/ @@ -1679,7 +1677,7 @@ add_xml_shape_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child) /* The list of points is similar to the one define in the SVG standard */ /* FIXME : The implementation is incomplete, a point still needs to be added to shapelist and add management for it's x/y coordinates */ - cd = xmlGetProp(xmlnode,"points"); + cd = (char *)xmlGetProp(xmlnode, BAD_CAST "points"); if(!cd) { cd = ""; @@ -1704,12 +1702,12 @@ add_xml_shape_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child) } /* get the X coord of the shape */ - cx = xmlGetProp(xmlnode,"x"); + cx = (char *)xmlGetProp(xmlnode, BAD_CAST "x"); if(!cx) cx = "100"; x = g_ascii_strtod(cx, NULL); /* get the Y coord of the shape */ - cy = xmlGetProp(xmlnode,"y"); + cy = (char *)xmlGetProp(xmlnode, BAD_CAST "y"); if(!cy) cy = "100"; y = g_ascii_strtod(cy, NULL); @@ -1718,12 +1716,12 @@ add_xml_shape_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child) gcompris_set_locale("C"); /* get the ZOOMX coord of the shape */ - czoomx = xmlGetProp(xmlnode,"zoomx"); + czoomx = (char *)xmlGetProp(xmlnode, BAD_CAST "zoomx"); if(!czoomx) czoomx = "1"; zoomx = g_ascii_strtod(czoomx, NULL); /* get the ZOOMY coord of the shape */ - czoomy = xmlGetProp(xmlnode,"zoomy"); + czoomy = (char *)xmlGetProp(xmlnode, BAD_CAST "zoomy"); if(!czoomy) czoomy = "1"; zoomy = g_ascii_strtod(czoomy, NULL); @@ -1732,7 +1730,7 @@ add_xml_shape_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child) * 0 = BOTTOM * 1 or more = TOP */ - cposition = xmlGetProp(xmlnode,"position"); + cposition = (char *)xmlGetProp(xmlnode, BAD_CAST "position"); if(!cposition) cposition = "0"; position = atoi(cposition); @@ -1741,7 +1739,7 @@ add_xml_shape_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child) g_strdup(locale); /* get the TYPE of the shape */ - ctype = xmlGetProp(xmlnode,"type"); + ctype = (char *)xmlGetProp(xmlnode, BAD_CAST "type"); if(!ctype) ctype = "SHAPE_TARGET"; /* SHAPE_TARGET is default */ if(g_strcasecmp(ctype,"SHAPE_TARGET")==0) type = SHAPE_TARGET; @@ -1754,7 +1752,7 @@ add_xml_shape_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child) /* get the JUSTIFICATION of the Title */ justification_gtk = GTK_JUSTIFY_CENTER; /* GTK_JUSTIFICATION_CENTER is default */ - justification = xmlGetProp(xmlnode,"justification"); + justification = (char *)xmlGetProp(xmlnode, BAD_CAST "justification"); if(justification) { if (strcmp(justification, "GTK_JUSTIFY_LEFT") == 0) { justification_gtk = GTK_JUSTIFY_LEFT; @@ -1768,7 +1766,7 @@ add_xml_shape_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child) } /* get the COLOR of the Title Specified by skin reference */ - color_text = xmlGetProp(xmlnode,"color_skin"); + color_text = (char *)xmlGetProp(xmlnode, BAD_CAST "color_skin"); if(color_text) { color_rgba = gcompris_skin_get_color(color_text); } else { @@ -1781,23 +1779,23 @@ add_xml_shape_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child) xmlnamenode = xmlnode->xmlChildrenNode; while (xmlnamenode != NULL) { - gchar *lang = xmlGetProp(xmlnamenode,"lang"); + gchar *lang = (char *)xmlGetProp(xmlnamenode, BAD_CAST "lang"); /* get the name of the shape */ - if (!strcmp(xmlnamenode->name, "name") + if (!strcmp((char *)xmlnamenode->name, "name") && (lang==NULL || !strcmp(lang, gcompris_get_locale()) || !strncmp(lang, gcompris_get_locale(), 2))) { - name = xmlNodeListGetString(doc, xmlnamenode->xmlChildrenNode, 1); + name = (char *)xmlNodeListGetString(doc, xmlnamenode->xmlChildrenNode, 1); } /* get the tooltip of the shape */ - if (!strcmp(xmlnamenode->name, "tooltip") + if (!strcmp((char *)xmlnamenode->name, "tooltip") && (lang==NULL || !strcmp(lang, gcompris_get_locale()) || !strncmp(lang, gcompris_get_locale(), 2))) { - tooltip = xmlNodeListGetString(doc, xmlnamenode->xmlChildrenNode, 1); + tooltip = (char *)xmlNodeListGetString(doc, xmlnamenode->xmlChildrenNode, 1); } xmlnamenode = xmlnamenode->next; @@ -1805,10 +1803,10 @@ add_xml_shape_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child) /* If name is not given as an element, try to get it as a property */ if(!name) - name = xmlGetProp(xmlnode,"name"); + name = (char *)xmlGetProp(xmlnode, BAD_CAST "name"); - if(g_strcasecmp(xmlnode->name,"Shape")==0) + if(g_strcasecmp((char *)xmlnode->name, "Shape")==0) { /* add the shape to the database */ /* WARNING : I do not initialize the width and height since I don't need them */ @@ -1819,7 +1817,7 @@ add_xml_shape_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child) /* add the shape to the list */ shape_list_init = g_list_append(shape_list_init, shape); } - else if (g_strcasecmp(xmlnode->name,"Title")==0) + else if (g_strcasecmp((char *)xmlnode->name, "Title")==0) { /* Readd \n is needed */ gchar *newname; @@ -1921,14 +1919,14 @@ read_xml_file(char *fname) /* if it doesn't have a name */ !doc->children->name || /* if it isn't a ShapeGame node */ - g_strcasecmp(doc->children->name,"ShapeGame")!=0) { + g_strcasecmp((char *)doc->children->name, "ShapeGame")!=0) { xmlFreeDoc(doc); return FALSE; } /*--------------------------------------------------*/ /* Read OkIfAddedName property */ - tmpstr = xmlGetProp(doc->children,"OkIfAddedName"); + tmpstr = (char *)xmlGetProp(doc->children, BAD_CAST "OkIfAddedName"); /* if unspecified, make it INT_MAX */ if(!tmpstr) addedname = INT_MAX; @@ -1938,7 +1936,7 @@ read_xml_file(char *fname) /*--------------------------------------------------*/ /* Read ShapeBox property */ - tmpstr = xmlGetProp(doc->children,"shapebox_x"); + tmpstr = (char *)xmlGetProp(doc->children, BAD_CAST "shapebox_x"); /* if unspecified, use the default value */ if(!tmpstr) shapeBox.x = 15; @@ -1946,7 +1944,7 @@ read_xml_file(char *fname) shapeBox.x = g_ascii_strtod(tmpstr, NULL); g_warning("shapeBox.x=%f\n", shapeBox.x); - tmpstr = xmlGetProp(doc->children,"shapebox_y"); + tmpstr = (char *)xmlGetProp(doc->children, BAD_CAST "shapebox_y"); /* if unspecified, use the default value */ if(!tmpstr) shapeBox.y = 25; @@ -1954,7 +1952,7 @@ read_xml_file(char *fname) shapeBox.y = g_ascii_strtod(tmpstr, NULL); g_warning("shapeBox.y=%f\n", shapeBox.y); - tmpstr = xmlGetProp(doc->children,"shapebox_w"); + tmpstr = (char *)xmlGetProp(doc->children, BAD_CAST "shapebox_w"); /* if unspecified, use the default value */ if(!tmpstr) shapeBox.w = 80; @@ -1962,7 +1960,7 @@ read_xml_file(char *fname) shapeBox.w = g_ascii_strtod(tmpstr, NULL); g_warning("shapeBox.w=%f\n", shapeBox.w); - tmpstr = xmlGetProp(doc->children,"shapebox_h"); + tmpstr = (char *)xmlGetProp(doc->children, BAD_CAST "shapebox_h"); /* if unspecified, use the default value */ if(!tmpstr) shapeBox.h = 430; @@ -1970,7 +1968,7 @@ read_xml_file(char *fname) shapeBox.h = g_ascii_strtod(tmpstr, NULL); g_warning("shapeBox.h=%f\n", shapeBox.h); - tmpstr = xmlGetProp(doc->children,"shapebox_nb_shape_x"); + tmpstr = (char *)xmlGetProp(doc->children, BAD_CAST "shapebox_nb_shape_x"); /* if unspecified, use the default value */ if(!tmpstr) shapeBox.nb_shape_x = 1; @@ -1978,7 +1976,7 @@ read_xml_file(char *fname) shapeBox.nb_shape_x = atoi(tmpstr); g_warning("shapeBox.nb_shape_x=%d\n", shapeBox.nb_shape_x); - tmpstr = xmlGetProp(doc->children,"shapebox_nb_shape_y"); + tmpstr = (char *)xmlGetProp(doc->children, BAD_CAST "shapebox_nb_shape_y"); /* if unspecified, use the default value */ if(!tmpstr) shapeBox.nb_shape_y = 5; @@ -2007,32 +2005,32 @@ write_shape_to_xml(xmlNodePtr xmlnode, Shape *shape) /* make a new xml node (as a child of xmlnode) with an empty content */ - newxml = xmlNewChild(xmlnode,NULL,"Shape",NULL); + newxml = xmlNewChild(xmlnode,NULL, BAD_CAST "Shape",NULL); /* set properties on it */ - xmlSetProp(newxml,"name",shape->name); + xmlSetProp(newxml, BAD_CAST "name", BAD_CAST shape->name); if(shape->tooltip) - xmlSetProp(newxml,"tooltip",shape->tooltip); - xmlSetProp(newxml,"pixmapfile",shape->pixmapfile); - xmlSetProp(newxml,"sound",shape->soundfile); + xmlSetProp(newxml, BAD_CAST "tooltip", BAD_CAST shape->tooltip); + xmlSetProp(newxml, BAD_CAST "pixmapfile", BAD_CAST shape->pixmapfile); + xmlSetProp(newxml, BAD_CAST "sound", BAD_CAST shape->soundfile); tmp = g_strdup_printf("%f", shape->x); - xmlSetProp(newxml,"x",tmp); + xmlSetProp(newxml, BAD_CAST "x", BAD_CAST tmp); g_free(tmp); tmp = g_strdup_printf("%f", shape->y); - xmlSetProp(newxml,"y",tmp); + xmlSetProp(newxml, BAD_CAST "y", BAD_CAST tmp); g_free(tmp); tmp = g_strdup_printf("%f", shape->zoomx); - xmlSetProp(newxml,"zoomx",tmp); + xmlSetProp(newxml, BAD_CAST "zoomx", BAD_CAST tmp); g_free(tmp); tmp = g_strdup_printf("%f", shape->zoomy); - xmlSetProp(newxml,"zoomy",tmp); + xmlSetProp(newxml, BAD_CAST "zoomy", BAD_CAST tmp); g_free(tmp); tmp = g_strdup_printf("%d", shape->position); - xmlSetProp(newxml,"position",tmp); + xmlSetProp(newxml, BAD_CAST "position", BAD_CAST tmp); g_free(tmp); } @@ -2050,9 +2048,9 @@ write_xml_file(char *fname) g_return_val_if_fail(fname!=NULL,FALSE); /* create new xml document with version 1.0 */ - doc = xmlNewDoc("1.0"); + doc = xmlNewDoc( BAD_CAST "1.0"); /* create a new root node "ShapeGame" */ - doc->children = xmlNewDocNode(doc, NULL, "ShapeGame", NULL); + doc->children = xmlNewDocNode(doc, NULL, BAD_CAST "ShapeGame", NULL); /* loop through all our shapes */ for(list = shape_list; list != NULL; list = list->next) { @@ -2086,9 +2084,9 @@ write_xml_file(char *fname) static GcomprisProfile *profile_conf; static GcomprisBoard *board_conf; -static GHFunc save_table (gpointer key, - gpointer value, - gpointer user_data) +static void save_table (gpointer key, + gpointer value, + gpointer user_data) { gcompris_set_board_conf ( profile_conf, board_conf, @@ -2096,7 +2094,7 @@ static GHFunc save_table (gpointer key, (gchar *) value); } -static GcomprisConfCallback conf_ok(GHashTable *table) +static void conf_ok(GHashTable *table) { if (!table){ if (gcomprisBoard) diff --git a/src/boards/smallnumbers.c b/src/boards/smallnumbers.c index 8b71568..e16c3d8 100644 --- a/src/boards/smallnumbers.c +++ b/src/boards/smallnumbers.c @@ -1,6 +1,6 @@ /* gcompris - smallnumbers.c * - * Time-stamp: <2006/05/08 23:20:52 bruno> + * Time-stamp: <2006/08/11 19:04:23 bruno> * * Copyright (C) 2000 Bruno Coudoin * @@ -522,7 +522,7 @@ static GHFunc save_table (gpointer key, return NULL; } -static GcomprisConfCallback conf_ok(GHashTable *table) +static void conf_ok(GHashTable *table) { if (!table){ if (gcomprisBoard) @@ -566,12 +566,6 @@ static GcomprisConfCallback conf_ok(GHashTable *table) profile_conf = NULL; } -static gboolean check_text(gchar *key, gchar *text, GtkLabel *label){ - gtk_label_set_markup(label, text); - - return TRUE; -} - static void sound_control_box_toggled(GtkToggleButton *togglebutton, gpointer combo) { diff --git a/src/boards/traffic.c b/src/boards/traffic.c index 2b1323d..bf07305 100644 --- a/src/boards/traffic.c +++ b/src/boards/traffic.c @@ -84,7 +84,7 @@ struct _jam { static int car_cb(GnomeCanvasItem *item, GdkEvent *event, car *thiscar); gboolean load_level(guint level, guint card); -static jam current_card ={0,0,0,NULL}; +static jam current_card ={0,0,0,{NULL}}; static void draw_grid (GnomeCanvasGroup *rootBorder); static gint cars_from_strv(char *strv); diff --git a/src/boards/wordprocessor.c b/src/boards/wordprocessor.c index 725fe21..92dcb7b 100644 --- a/src/boards/wordprocessor.c +++ b/src/boards/wordprocessor.c @@ -523,14 +523,14 @@ item_event_style_selection (GtkComboBox *widget, void *doctype_names[]) { gchar *style_str; - style_t **doctype; + style_t *doctype[1]; style_str = gtk_combo_box_get_active_text((GtkComboBox *)widget); printf("item_event_style_selection %s\n", style_str); /* Search the doctype */ - doctype = (style_t *)(g_hash_table_lookup(styles_hash, style_str)); + doctype[0] = (style_t *)(g_hash_table_lookup(styles_hash, style_str)); if(doctype) { int i = 0; diff --git a/src/boards/wordsgame.c b/src/boards/wordsgame.c index b83d0a4..d7b0632 100644 --- a/src/boards/wordsgame.c +++ b/src/boards/wordsgame.c @@ -1,6 +1,6 @@ /* gcompris - wordsgame.c * - * Time-stamp: <2005/10/30 21:34:00 bruno> + * Time-stamp: <2006/08/11 18:08:59 bruno> * * Copyright (C) 2000 Bruno Coudoin * @@ -790,7 +790,8 @@ static gboolean wordsgame_read_wordfile() g_ptr_array_add(words,buf); } fclose(wordsfd); - + + return TRUE; } diff --git a/src/gcompris/about.c b/src/gcompris/about.c index ea1f756..2630e4e 100644 --- a/src/gcompris/about.c +++ b/src/gcompris/about.c @@ -1,6 +1,6 @@ /* gcompris - about.c * - * Time-stamp: <2005/10/05 00:57:09 bruno> + * Time-stamp: <2006/08/11 17:21:46 bruno> * * Copyright (C) 2000 Bruno Coudoin * @@ -25,6 +25,7 @@ #include "gcompris.h" #include "about.h" +#include <string.h> #if defined _WIN32 || defined __WIN32__ # undef WIN32 /* avoid warning on mingw32 */ @@ -53,7 +54,6 @@ void gcompris_about_stop (void); */ void gcompris_about_start () { - GcomprisBoard *gcomprisBoard = get_current_gcompris_board(); GdkPixbuf *pixmap = NULL; gint y_start = 0; gint x_start = 0; @@ -73,8 +73,7 @@ void gcompris_about_start () gchar *translators = _("translator_credits"); /* Pause the board */ - if(gcomprisBoard->plugin->pause_board != NULL) - gcomprisBoard->plugin->pause_board(TRUE); + board_pause(TRUE); if(rootitem) return; @@ -385,8 +384,6 @@ void gcompris_about_start () void gcompris_about_stop () { - GcomprisBoard *gcomprisBoard = get_current_gcompris_board(); - if (move_plane_id) { gtk_timeout_remove (move_plane_id); move_plane_id = 0; @@ -402,10 +399,8 @@ void gcompris_about_stop () pixmap_about = NULL; /* UnPause the board */ - if(gcomprisBoard->plugin->pause_board != NULL && is_displayed) - { - gcomprisBoard->plugin->pause_board(FALSE); - } + if(is_displayed) + board_pause(FALSE); gcompris_bar_hide (FALSE); diff --git a/src/gcompris/anim.h b/src/gcompris/anim.h index cf0dab1..5183924 100644 --- a/src/gcompris/anim.h +++ b/src/gcompris/anim.h @@ -46,5 +46,6 @@ GcomprisAnimCanvasItem *gcompris_activate_animation(GnomeCanvasGroup *parent, void gcompris_set_anim_state(GcomprisAnimCanvasItem*, int); void gcompris_deactivate_animation(GcomprisAnimCanvasItem*); void gcompris_free_animation(GcomprisAnimation*); +void gcompris_swap_animation(GcomprisAnimCanvasItem *item, GcomprisAnimation *new_anim); #endif diff --git a/src/gcompris/board_config.c b/src/gcompris/board_config.c index b33538e..234b9be 100644 --- a/src/gcompris/board_config.c +++ b/src/gcompris/board_config.c @@ -1,6 +1,6 @@ /* gcompris - board_config.c * - * Time-stamp: <2006/08/11 14:22:34 bruno> + * Time-stamp: <2006/08/11 17:27:15 bruno> * * Copyright (C) 2001 Pascal Georges * @@ -191,7 +191,7 @@ GtkVBox *gcompris_configuration_window(gchar *label, GcomprisConfCallback callba GcomprisProperties *properties = gcompris_get_properties(); if (properties->fullscreen && !properties->noxf86vm) if (gdk_pointer_grab(gcompris_get_window()->window, TRUE, 0, - gcompris_get_window(), NULL, GDK_CURRENT_TIME) != + GDK_WINDOW(gcompris_get_window()), NULL, GDK_CURRENT_TIME) != GDK_GRAB_SUCCESS) g_warning("Pointer grab failed"); diff --git a/src/gcompris/bonus.c b/src/gcompris/bonus.c index 27a07e1..9f05cec 100644 --- a/src/gcompris/bonus.c +++ b/src/gcompris/bonus.c @@ -120,8 +120,7 @@ void board_finished(BoardFinishedList type) { board_finished_running = TRUE; /* First pause the board */ - if(gcomprisBoard->plugin->pause_board != NULL) - gcomprisBoard->plugin->pause_board(TRUE); + board_pause(TRUE); /* WARNING: I remove 1 to the BOARD_FINISHED_LAST because RANDOM is for GOOD end only */ if(type==BOARD_FINISHED_RANDOM) @@ -204,7 +203,6 @@ void board_finished(BoardFinishedList type) { /* ==================================== */ void gcompris_display_bonus(BonusStatusList gamewon, BonusList bonus_id) { - GcomprisBoard *gcomprisBoard = get_current_gcompris_board(); gchar *absolute_file; gcompris_bar_hide(TRUE); @@ -238,8 +236,7 @@ void gcompris_display_bonus(BonusStatusList gamewon, BonusList bonus_id) } /* First pause the board */ - if(gcomprisBoard->plugin->pause_board != NULL) - gcomprisBoard->plugin->pause_board(TRUE); + board_pause(TRUE); if(bonus_id==BONUS_RANDOM) bonus_id = RAND(1, BONUS_LAST); @@ -357,8 +354,6 @@ void bonus_image(char *image, BonusStatusList gamewon) /* ==================================== */ void end_bonus() { - GcomprisBoard *gcomprisBoard = get_current_gcompris_board(); - if (end_bonus_id) { gtk_timeout_remove (end_bonus_id); end_bonus_id = 0; @@ -373,6 +368,5 @@ void end_bonus() gcompris_bar_hide(FALSE); /* Re-Start the board */ - if(gcomprisBoard->plugin->pause_board != NULL) - gcomprisBoard->plugin->pause_board(FALSE); + board_pause(FALSE); } diff --git a/src/gcompris/config.c b/src/gcompris/config.c index dd720dd..2d05554 100644 --- a/src/gcompris/config.c +++ b/src/gcompris/config.c @@ -1,6 +1,6 @@ /* gcompris - config.c * - * Time-stamp: <2006/07/31 02:57:33 bruno> + * Time-stamp: <2006/08/11 17:46:01 bruno> * * Copyright (C) 2000-2003 Bruno Coudoin * @@ -146,7 +146,6 @@ static void display_previous_next(guint x_start, guint y_start, */ void gcompris_config_start () { - GcomprisBoard *gcomprisBoard = get_current_gcompris_board(); GcomprisProperties *properties = gcompris_get_properties(); GdkPixbuf *pixmap = NULL; gint y_start = 0; @@ -157,8 +156,7 @@ void gcompris_config_start () GnomeCanvasItem *item, *item2; /* Pause the board */ - if(gcomprisBoard->plugin->pause_board != NULL) - gcomprisBoard->plugin->pause_board(TRUE); + board_pause(TRUE); if(rootitem) return; @@ -203,49 +201,6 @@ void gcompris_config_start () "fill_color_rgba", gcompris_skin_color_title, NULL); - // OK - pixmap = gcompris_load_skin_pixmap("button_large.png"); - item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), - gnome_canvas_pixbuf_get_type (), - "pixbuf", pixmap, - "x", (double) (BOARDWIDTH*0.5) - gdk_pixbuf_get_width(pixmap)/2, - "y", (double) y - gdk_pixbuf_get_height(pixmap) - 5, - NULL); - - gtk_signal_connect(GTK_OBJECT(item), "event", - (GtkSignalFunc) item_event_ok, - "ok"); - gtk_signal_connect(GTK_OBJECT(item), "event", - (GtkSignalFunc) gcompris_item_event_focus, - NULL); - - gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), - gnome_canvas_text_get_type (), - "text", _("OK"), - "font", gcompris_skin_font_title, - "x", (double) BOARDWIDTH*0.5 + 1.0, - "y", (double) y - gdk_pixbuf_get_height(pixmap) + 20 + 1.0, - "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_shadow, - NULL); - item2 = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), - gnome_canvas_text_get_type (), - "text", _("OK"), - "font", gcompris_skin_font_title, - "x", (double) BOARDWIDTH*0.5, - "y", (double) y - gdk_pixbuf_get_height(pixmap) + 20, - "anchor", GTK_ANCHOR_CENTER, - "fill_color_rgba", gcompris_skin_color_text_button, - NULL); - gtk_signal_connect(GTK_OBJECT(item2), "event", - (GtkSignalFunc) item_event_ok, - "ok"); - gtk_signal_connect(GTK_OBJECT(item2), "event", - (GtkSignalFunc) gcompris_item_event_focus, - item); - gdk_pixbuf_unref(pixmap); - - pixmap_checked = gcompris_load_skin_pixmap("button_checked.png"); pixmap_unchecked = gcompris_load_skin_pixmap("button_unchecked.png"); @@ -482,18 +437,59 @@ void gcompris_config_start () NULL); + // OK + pixmap = gcompris_load_skin_pixmap("button_large.png"); + item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), + gnome_canvas_pixbuf_get_type (), + "pixbuf", pixmap, + "x", (double) (BOARDWIDTH*0.5) - gdk_pixbuf_get_width(pixmap)/2, + "y", (double) y - gdk_pixbuf_get_height(pixmap) - 5, + NULL); + + gtk_signal_connect(GTK_OBJECT(item), "event", + (GtkSignalFunc) item_event_ok, + "ok"); + gtk_signal_connect(GTK_OBJECT(item), "event", + (GtkSignalFunc) gcompris_item_event_focus, + NULL); + + gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), + gnome_canvas_text_get_type (), + "text", _("OK"), + "font", gcompris_skin_font_title, + "x", (double) BOARDWIDTH*0.5 + 1.0, + "y", (double) y - gdk_pixbuf_get_height(pixmap) + 20 + 1.0, + "anchor", GTK_ANCHOR_CENTER, + "fill_color_rgba", gcompris_skin_color_shadow, + NULL); + item2 = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem), + gnome_canvas_text_get_type (), + "text", _("OK"), + "font", gcompris_skin_font_title, + "x", (double) BOARDWIDTH*0.5, + "y", (double) y - gdk_pixbuf_get_height(pixmap) + 20, + "anchor", GTK_ANCHOR_CENTER, + "fill_color_rgba", gcompris_skin_color_text_button, + NULL); + gtk_signal_connect(GTK_OBJECT(item2), "event", + (GtkSignalFunc) item_event_ok, + "ok"); + gtk_signal_connect(GTK_OBJECT(item2), "event", + (GtkSignalFunc) gcompris_item_event_focus, + item); + gdk_pixbuf_unref(pixmap); + + is_displayed = TRUE; } void gcompris_config_stop () { - GcomprisBoard *gcomprisBoard = get_current_gcompris_board(); - // Destroy the help box if(rootitem!=NULL) { gtk_object_destroy(GTK_OBJECT(rootitem)); - gcomprisBoard->plugin->pause_board(FALSE); + board_pause(FALSE); } rootitem = NULL; @@ -508,10 +504,8 @@ void gcompris_config_stop () pixmap_checked = NULL; /* UnPause the board */ - if((gcomprisBoard->plugin->pause_board != NULL) && is_displayed) - { - gcomprisBoard->plugin->pause_board(FALSE); - } + if(is_displayed) + board_pause(FALSE); gcompris_bar_hide(FALSE); diff --git a/src/gcompris/file_selector.c b/src/gcompris/file_selector.c index d16c514..375f2c3 100644 --- a/src/gcompris/file_selector.c +++ b/src/gcompris/file_selector.c @@ -1,6 +1,6 @@ /* gcompris - file_selector.c * - * Time-stamp: <2006/05/05 00:01:26 bruno> + * Time-stamp: <2006/08/11 17:14:26 bruno> * * Copyright (C) 2000 Bruno Coudoin * @@ -141,12 +141,7 @@ void gcompris_file_selector_stop () GcomprisBoard *gcomprisBoard = get_current_gcompris_board(); if(gcomprisBoard!=NULL && file_selector_displayed) - { - if(gcomprisBoard->plugin->pause_board != NULL) - { - gcomprisBoard->plugin->pause_board(FALSE); - } - } + board_pause(FALSE); // Destroy the file_selector box /* FIXME: Crashes randomly */ @@ -211,11 +206,7 @@ display_file_selector(int the_mode, gcompris_bar_hide(TRUE); - if(gcomprisBoard!=NULL) - { - if(gcomprisBoard->plugin->pause_board != NULL) - gcomprisBoard->plugin->pause_board(TRUE); - } + board_pause(TRUE); name = gcomprisBoard->name; fileSelectorCallBack=iscb; diff --git a/src/gcompris/gameutil.c b/src/gcompris/gameutil.c index 28af3bd..3ad6fc5 100644 --- a/src/gcompris/gameutil.c +++ b/src/gcompris/gameutil.c @@ -1,6 +1,6 @@ /* gcompris - gameutil.c * - * Time-stamp: <2006/08/11 14:11:24 bruno> + * Time-stamp: <2006/08/11 16:56:32 bruno> * * Copyright (C) 2000-2006 Bruno Coudoin * @@ -687,7 +687,7 @@ int selectMenuXML(const gchar *file) return (strncmp (&file[strlen(file)-4], ".xml", 4) == 0); } -void cleanup_menus() { +static void cleanup_menus() { GList *list = NULL; for(list = boards_list; list != NULL; list = list->next) { @@ -702,7 +702,7 @@ void cleanup_menus() { * suppress_int_from_list */ -GList *suppress_int_from_list(GList *list, int value) +static GList *suppress_int_from_list(GList *list, int value) { GList *cell = list; @@ -720,7 +720,7 @@ GList *suppress_int_from_list(GList *list, int value) return list; } -gboolean compare_id(gconstpointer data1, gconstpointer data2) +static gboolean compare_id(gconstpointer data1, gconstpointer data2) { int *i = (int *) data1; int *j = (int *) data2; @@ -1129,8 +1129,6 @@ void gcompris_dialog(gchar *str, DialogBoxCallBack dbcb) static gint item_event_ok(GnomeCanvasItem *item, GdkEvent *event, DialogBoxCallBack dbcb) { - GcomprisBoard *gcomprisBoard = get_current_gcompris_board(); - switch (event->type) { case GDK_ENTER_NOTIFY: diff --git a/src/gcompris/gcompris_confirm.c b/src/gcompris/gcompris_confirm.c index 176564f..d03eb22 100644 --- a/src/gcompris/gcompris_confirm.c +++ b/src/gcompris/gcompris_confirm.c @@ -1,6 +1,6 @@ /* gcompris - gcompris_confirm.c * - * Time-stamp: <2006/04/10 00:00:58 bruno> + * Time-stamp: <2006/08/11 17:28:11 bruno> * * Copyright (C) 2000 Bruno Coudoin * @@ -135,12 +135,7 @@ void gcompris_confirm_stop () rootitem = NULL; if(gcomprisBoard!=NULL && confirm_displayed) - { - if(gcomprisBoard->plugin->pause_board != NULL) - { - gcomprisBoard->plugin->pause_board(FALSE); - } - } + board_pause(FALSE); gcompris_bar_hide(FALSE); confirm_displayed = FALSE; @@ -161,9 +156,6 @@ display_confirm(gchar *title, gchar *no_text, ConfirmCallBack iscb) { - GcomprisBoard *gcomprisBoard = get_current_gcompris_board(); - - GnomeCanvasItem *item, *item2, *richtext_s, *richtext; GdkPixbuf *pixmap = NULL; GdkPixbuf *pixmap_cross = NULL; @@ -197,11 +189,7 @@ display_confirm(gchar *title, gcompris_bar_hide(TRUE); - if(gcomprisBoard!=NULL) - { - if(gcomprisBoard->plugin->pause_board != NULL) - gcomprisBoard->plugin->pause_board(TRUE); - } + board_pause(TRUE); confirmCallBack=iscb; @@ -391,12 +379,6 @@ display_confirm(gchar *title, } -static void -free_stuff (GtkObject *obj, gchar *data) -{ - g_free(data); -} - /* Apply the style to the given RichText item */ static void set_content(GnomeCanvasRichText *item_content, diff --git a/src/gcompris/gcompris_im.c b/src/gcompris/gcompris_im.c index acab52f..fc857cb 100644 --- a/src/gcompris/gcompris_im.c +++ b/src/gcompris/gcompris_im.c @@ -1,6 +1,6 @@ /* gcompris - gcompris_im.c * - * Time-stamp: <2005/10/02 22:17:33 bruno> + * Time-stamp: <2006/08/11 17:37:17 bruno> * * Copyright (C) 2000,2003 Bruno Coudoin * @@ -90,6 +90,7 @@ static gint im_context_commit_callback (GtkIMContext *imcontext, // g_free(arg1); return(result); } + return FALSE; } static gint im_context_preedit_callback (GtkIMContext *imcontext, @@ -111,6 +112,7 @@ static gint im_context_preedit_callback (GtkIMContext *imcontext, pango_attr_list_unref (attrs); return(result); } + return FALSE; } static gint window_focus_callback (GtkWidget *widget, diff --git a/src/gcompris/help.c b/src/gcompris/help.c index fac9c54..13ecd52 100644 --- a/src/gcompris/help.c +++ b/src/gcompris/help.c @@ -1,6 +1,6 @@ /* gcompris - help.c * - * Time-stamp: <2006/04/09 23:28:08 bruno> + * Time-stamp: <2006/08/11 17:24:52 bruno> * * Copyright (C) 2000 Bruno Coudoin * @@ -101,11 +101,7 @@ void gcompris_help_start (GcomprisBoard *gcomprisBoard) if(rootitem) return; - if(gcomprisBoard!=NULL) - { - if(gcomprisBoard->plugin->pause_board != NULL) - gcomprisBoard->plugin->pause_board(TRUE); - } + board_pause(TRUE); item_selected = NULL; item_selected_text = NULL; @@ -414,20 +410,15 @@ void gcompris_help_start (GcomprisBoard *gcomprisBoard) */ void gcompris_help_stop () { - GcomprisBoard *gcomprisBoard = get_current_gcompris_board(); - - if(gcomprisBoard!=NULL && help_displayed) + if(help_displayed) { - if(gcomprisBoard->plugin->pause_board != NULL) + // Destroy the help box + if(rootitem!=NULL) { - // Destroy the help box - if(rootitem!=NULL) - { - gtk_object_destroy(GTK_OBJECT(rootitem)); - gcomprisBoard->plugin->pause_board(FALSE); - } + gtk_object_destroy(GTK_OBJECT(rootitem)); rootitem = NULL; } + board_pause(FALSE); } gcompris_bar_hide(FALSE); diff --git a/src/gcompris/images_selector.c b/src/gcompris/images_selector.c index 88d19a5..1c51fb0 100644 --- a/src/gcompris/images_selector.c +++ b/src/gcompris/images_selector.c @@ -1,6 +1,6 @@ /* gcompris - images_selector.c * - * Time-stamp: <2006/05/11 23:27:55 bruno> + * Time-stamp: <2006/08/11 17:07:52 bruno> * * Copyright (C) 2000 Bruno Coudoin * @@ -116,11 +116,7 @@ void gcompris_images_selector_start (GcomprisBoard *gcomprisBoard, gchar *datase gcompris_bar_hide(TRUE); - if(gcomprisBoard!=NULL) - { - if(gcomprisBoard->plugin->pause_board != NULL) - gcomprisBoard->plugin->pause_board(TRUE); - } + board_pause(TRUE); name = gcomprisBoard->name; imageSelectorCallBack=iscb; @@ -310,10 +306,7 @@ void gcompris_images_selector_stop () if(gcomprisBoard!=NULL && images_selector_displayed) { - if(gcomprisBoard->plugin->pause_board != NULL) - { - gcomprisBoard->plugin->pause_board(FALSE); - } + board_pause(FALSE); } // Destroy the images_selector box diff --git a/src/gcompris/log.c b/src/gcompris/log.c index df56487..7364acd 100644 --- a/src/gcompris/log.c +++ b/src/gcompris/log.c @@ -167,7 +167,7 @@ void gcompris_log_end (GcomprisBoard *gcomprisBoard, gchar *status) { struct tm *tp; GcomprisUser *gcomprisUser = gcompris_get_current_user(); - char *username = g_get_user_name(); + const char *username = g_get_user_name(); if(gcomprisBoard_set != gcomprisBoard) return; diff --git a/src/gcompris/profile.c b/src/gcompris/profile.c index 43d796b..6beb700 100644 --- a/src/gcompris/profile.c +++ b/src/gcompris/profile.c @@ -1,6 +1,6 @@ /* gcompris - profile.c * - * Time-stamp: <2006/03/29 01:33:14 bruno> + * Time-stamp: <2006/08/11 17:29:49 bruno> * * Copyright (C) 2005 Bruno Coudoin * @@ -42,7 +42,7 @@ GcomprisProfile void -*gcompris_set_current_user(GcomprisUser *user) +gcompris_set_current_user(GcomprisUser *user) { GcomprisProperties *properties = gcompris_get_properties(); @@ -52,13 +52,13 @@ void g_warning("No user, getting one from system."); GcomprisUser *sys_user = g_malloc0(sizeof(GcomprisUser)); - gchar *user_name = g_get_user_name (); + const gchar *user_name = g_get_user_name (); if (user_name) sys_user->login = g_strdup(user_name); else sys_user->login = g_strdup("nobody"); - gchar *last_name = g_get_real_name (); + const gchar *last_name = g_get_real_name (); if (last_name) sys_user->lastname = g_strdup(last_name); else diff --git a/src/gcompris/profile.h b/src/gcompris/profile.h index 23bd45c..362757f 100644 --- a/src/gcompris/profile.h +++ b/src/gcompris/profile.h @@ -1,6 +1,6 @@ /* gcompris - profile.h * - * Time-stamp: <2005/08/26 00:35:48 yves> + * Time-stamp: <2006/08/11 17:30:14 bruno> * * Copyright (C) 2005 Bruno Coudoin * @@ -140,7 +140,7 @@ typedef struct { GcomprisProfile *gcompris_get_current_profile(); /* list of Gcomprisusers */ -void *gcompris_set_current_user(GcomprisUser *user); +void gcompris_set_current_user(GcomprisUser *user); GcomprisUser *gcompris_get_current_user(); #endif diff --git a/src/gcompris/wordlist.c b/src/gcompris/wordlist.c index 6eae517..ed1bb22 100644 --- a/src/gcompris/wordlist.c +++ b/src/gcompris/wordlist.c @@ -20,6 +20,7 @@ #include "gcompris.h" #include <libxml/tree.h> #include <libxml/parser.h> +#include <string.h> GcomprisWordlist *gcompris_get_wordlist_from_file(gchar *filename) { @@ -127,7 +128,7 @@ GcomprisWordlist *gcompris_get_wordlist_from_file(gchar *filename) continue; } - if (strcmp(node->name,"level")!=0){ + if (strcmp((char *)node->name,"level")!=0){ g_warning("Parsing %s error", filename); break; } |
