[gcompris] cleanup, replaced deprecated g_strcasecmp by g_ascii_strcasecmp
- From: Bruno Coudoin <bcoudoin src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gcompris] cleanup, replaced deprecated g_strcasecmp by g_ascii_strcasecmp
- Date: Mon, 12 Dec 2011 22:25:01 +0000 (UTC)
commit c57d260044f13d316df21992e48640031f55a7ea
Author: Hans de Goede <hdegoede redhat com>
Date: Mon Dec 12 22:54:35 2011 +0100
cleanup, replaced deprecated g_strcasecmp by g_ascii_strcasecmp
src/algebra_by-activity/algebra.c | 10 ++--
.../algebra_guesscount.c | 2 +-
src/awele-activity/awele.c | 2 +-
src/babymatch-activity/shapegame.c | 26 ++++++------
src/billard-activity/billard.c | 2 +-
src/boards/menu2.c | 4 +-
src/canal_lock-activity/canal_lock.c | 2 +-
src/chess_computer-activity/chess.c | 12 +++---
src/click_on_letter-activity/click_on_letter.c | 4 +-
src/clickgame-activity/clickgame.c | 2 +-
src/clockgame-activity/clockgame.c | 2 +-
src/crane-activity/crane.c | 2 +-
src/enumerate-activity/enumerate.c | 2 +-
src/erase-activity/erase.c | 2 +-
src/fifteen-activity/fifteen.c | 2 +-
src/gcompris/images_selector.c | 4 +-
src/gcompris/menu.c | 6 +-
src/gcompris/skin.c | 10 ++--
src/gcompris/wordlist.c | 4 +-
src/gletters-activity/gletters.c | 2 +-
src/hanoi-activity/hanoi.c | 2 +-
src/hanoi_real-activity/hanoi_real.c | 2 +-
src/imageid-activity/imageid.c | 6 +-
src/leftright-activity/leftright.c | 2 +-
src/magic_hat_minus-activity/magic_hat.c | 2 +-
src/maze-activity/maze.c | 10 ++--
src/memory-activity/memory.c | 44 ++++++++++----------
src/missing_letter-activity/missingletter.c | 6 +-
src/money-activity/money.c | 2 +-
src/paratrooper-activity/paratrooper.c | 2 +-
src/photohunter-activity/photohunter.c | 2 +-
src/planegame-activity/planegame.c | 2 +-
src/railroad-activity/railroad.c | 2 +-
src/readingh-activity/reading.c | 4 +-
src/reversecount-activity/reversecount.c | 2 +-
src/scalesboard-activity/scale.c | 4 +-
src/smallnumbers-activity/smallnumbers.c | 4 +-
src/submarine-activity/submarine.c | 2 +-
src/superbrain-activity/superbrain.c | 2 +-
src/tangram-activity/gtans.c | 2 +-
src/target-activity/target.c | 2 +-
src/traffic-activity/traffic.c | 2 +-
src/wordprocessor-activity/wordprocessor.c | 22 +++++-----
src/wordsgame-activity/wordsgame.c | 2 +-
44 files changed, 117 insertions(+), 117 deletions(-)
---
diff --git a/src/algebra_by-activity/algebra.c b/src/algebra_by-activity/algebra.c
index b445eb1..f42ea94 100644
--- a/src/algebra_by-activity/algebra.c
+++ b/src/algebra_by-activity/algebra.c
@@ -207,22 +207,22 @@ static void start_board (GcomprisBoard *agcomprisBoard)
currentOperation[0]=PLUSSIGNFILE;
currentOperationText = op_add;
}
- else if(g_strncasecmp(gcomprisBoard->mode, "+", 1)==0)
+ else if(g_ascii_strncasecmp(gcomprisBoard->mode, "+", 1)==0)
{
currentOperation[0]=PLUSSIGNFILE;
currentOperationText = op_add;
}
- else if(g_strncasecmp(gcomprisBoard->mode, "-", 1)==0)
+ else if(g_ascii_strncasecmp(gcomprisBoard->mode, "-", 1)==0)
{
currentOperation[0]=MINUSSIGNFILE;
currentOperationText = op_minus;
}
- else if(g_strncasecmp(gcomprisBoard->mode, "*", 1)==0)
+ else if(g_ascii_strncasecmp(gcomprisBoard->mode, "*", 1)==0)
{
currentOperation[0]=BYSIGNFILE;
currentOperationText = op_mult;
}
- else if(g_strncasecmp(gcomprisBoard->mode, "/", 1)==0)
+ else if(g_ascii_strncasecmp(gcomprisBoard->mode, "/", 1)==0)
{
currentOperation[0]=DIVIDESIGNFILE;
currentOperationText = op_div;
@@ -368,7 +368,7 @@ is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "algebra")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "algebra")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
diff --git a/src/algebra_guesscount-activity/algebra_guesscount.c b/src/algebra_guesscount-activity/algebra_guesscount.c
index 85cdc5e..a5fe7de 100644
--- a/src/algebra_guesscount-activity/algebra_guesscount.c
+++ b/src/algebra_guesscount-activity/algebra_guesscount.c
@@ -252,7 +252,7 @@ static void set_level (guint level) {
/* ==================================== */
static gboolean is_our_board (GcomprisBoard *gcomprisBoard) {
if (gcomprisBoard) {
- if(g_strcasecmp(gcomprisBoard->type, "algebra_guesscount")==0) {
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "algebra_guesscount")==0) {
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
return TRUE;
diff --git a/src/awele-activity/awele.c b/src/awele-activity/awele.c
index eb8002a..6775673 100644
--- a/src/awele-activity/awele.c
+++ b/src/awele-activity/awele.c
@@ -190,7 +190,7 @@ is_our_board (GcomprisBoard * gcomprisBoard)
{
if (gcomprisBoard)
{
- if (g_strcasecmp (gcomprisBoard->type, "awele") == 0)
+ if (g_ascii_strcasecmp (gcomprisBoard->type, "awele") == 0)
{
/*
* Set the plugin entry
diff --git a/src/babymatch-activity/shapegame.c b/src/babymatch-activity/shapegame.c
index 77d0635..bc1dbf8 100644
--- a/src/babymatch-activity/shapegame.c
+++ b/src/babymatch-activity/shapegame.c
@@ -278,7 +278,7 @@ static void start_board (GcomprisBoard *agcomprisBoard)
if(gcomprisBoard->mode!=NULL)
- if(g_strncasecmp(gcomprisBoard->mode, "background=", 11)==0)
+ if(g_ascii_strncasecmp(gcomprisBoard->mode, "background=", 11)==0)
{
gchar *tmp = NULL;
@@ -355,7 +355,7 @@ is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "shapegame")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "shapegame")==0)
{
gcomprisBoard->plugin = &menu_bp;
@@ -1628,13 +1628,13 @@ add_xml_shape_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child, GList **
if(/* if the node has no name */
!xmlnode->name ||
/* or if the name is not "Shape" */
- ((g_strcasecmp((const char *)xmlnode->name,"Shape")!=0) &&
+ ((g_ascii_strcasecmp((const char *)xmlnode->name,"Shape")!=0) &&
/* or if the name is not "Title" */
- (g_strcasecmp((const char *)xmlnode->name,"Title")!=0) &&
+ (g_ascii_strcasecmp((const char *)xmlnode->name,"Title")!=0) &&
/* or if the name is not "Title" */
- (g_strcasecmp((const char *)xmlnode->name,"Info")!=0) &&
+ (g_ascii_strcasecmp((const char *)xmlnode->name,"Info")!=0) &&
/* or if the name is not "Option" */
- (g_strcasecmp((const char *)xmlnode->name,"Option")!=0) )
+ (g_ascii_strcasecmp((const char *)xmlnode->name,"Option")!=0) )
)
return;
@@ -1673,11 +1673,11 @@ add_xml_shape_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child, GList **
/* get the TYPE of the shape */
ctype = (char *)xmlGetProp(xmlnode, BAD_CAST "type");
if(ctype) {
- if(g_strcasecmp(ctype,"SHAPE_TARGET")==0)
+ if(g_ascii_strcasecmp(ctype,"SHAPE_TARGET")==0)
type = SHAPE_TARGET;
- else if(g_strcasecmp(ctype,"SHAPE_DUMMY_TARGET")==0)
+ else if(g_ascii_strcasecmp(ctype,"SHAPE_DUMMY_TARGET")==0)
type = SHAPE_DUMMY_TARGET;
- else if (g_strcasecmp(ctype,"SHAPE_BACKGROUND")==0)
+ else if (g_ascii_strcasecmp(ctype,"SHAPE_BACKGROUND")==0)
type = SHAPE_BACKGROUND;
xmlFree(ctype);
}
@@ -1748,7 +1748,7 @@ add_xml_shape_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child, GList **
if(!name)
name = (char *)xmlGetProp(xmlnode, BAD_CAST "name");
- if(g_strcasecmp((char *)xmlnode->name, "Shape")==0)
+ if(g_ascii_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 */
@@ -1761,7 +1761,7 @@ add_xml_shape_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child, GList **
/* add the shape to the list */
*list = g_list_append(*list, shape);
}
- else if (g_strcasecmp((char *)xmlnode->name, "Title")==0)
+ else if (g_ascii_strcasecmp((char *)xmlnode->name, "Title")==0)
{
/* Read \n is needed */
gchar *newname;
@@ -1775,7 +1775,7 @@ add_xml_shape_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child, GList **
g_free(newname);
}
}
- else if (g_strcasecmp((char *)xmlnode->name, "Info")==0)
+ else if (g_ascii_strcasecmp((char *)xmlnode->name, "Info")==0)
{
/* Read \n is needed */
gchar *newname;
@@ -1876,7 +1876,7 @@ read_xml_file(char *fname)
/* if it doesn't have a name */
!doc->children->name ||
/* if it isn't a ShapeGame node */
- g_strcasecmp((char *)doc->children->name, "ShapeGame")!=0) {
+ g_ascii_strcasecmp((char *)doc->children->name, "ShapeGame")!=0) {
xmlFreeDoc(doc);
return FALSE;
}
diff --git a/src/billard-activity/billard.c b/src/billard-activity/billard.c
index 3b923a5..47e9a63 100644
--- a/src/billard-activity/billard.c
+++ b/src/billard-activity/billard.c
@@ -181,7 +181,7 @@ static gboolean is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "billard")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "billard")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
diff --git a/src/boards/menu2.c b/src/boards/menu2.c
index 040390a..453a0d5 100644
--- a/src/boards/menu2.c
+++ b/src/boards/menu2.c
@@ -405,7 +405,7 @@ menu_is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "menu")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "menu")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
@@ -525,7 +525,7 @@ static void menu_create_item(GooCanvasItem *parent, MenuItems *menuitems, Gcompr
}
// display menu icon ========================== BEGIN
- if(g_strcasecmp(board->type, "menu") == 0)
+ if(g_ascii_strcasecmp(board->type, "menu") == 0)
{
GooCanvasItem *item = goo_canvas_svg_new (parent,
gc_skin_rsvg_get(),
diff --git a/src/canal_lock-activity/canal_lock.c b/src/canal_lock-activity/canal_lock.c
index f6d5716..c0560a3 100644
--- a/src/canal_lock-activity/canal_lock.c
+++ b/src/canal_lock-activity/canal_lock.c
@@ -219,7 +219,7 @@ static gboolean is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "canal_lock")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "canal_lock")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
diff --git a/src/chess_computer-activity/chess.c b/src/chess_computer-activity/chess.c
index 31690ee..c7f987e 100644
--- a/src/chess_computer-activity/chess.c
+++ b/src/chess_computer-activity/chess.c
@@ -278,11 +278,11 @@ static void start_board (GcomprisBoard *agcomprisBoard)
/* Default mode */
if(!gcomprisBoard->mode)
gameType=COMPUTER;
- else if(g_strncasecmp(gcomprisBoard->mode, "computer", 1)==0)
+ else if(g_ascii_strncasecmp(gcomprisBoard->mode, "computer", 1)==0)
gameType=COMPUTER;
- else if(g_strncasecmp(gcomprisBoard->mode, "partyend", 1)==0)
+ else if(g_ascii_strncasecmp(gcomprisBoard->mode, "partyend", 1)==0)
gameType=PARTYEND;
- else if(g_strncasecmp(gcomprisBoard->mode, "movelearn", 1)==0)
+ else if(g_ascii_strncasecmp(gcomprisBoard->mode, "movelearn", 1)==0)
gameType=MOVELEARN;
gcomprisBoard->level=1;
@@ -371,7 +371,7 @@ static gboolean is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "chess")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "chess")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
@@ -1067,10 +1067,10 @@ engine_local_destroy (GPid gnuchess_pid)
g_source_remove(read_cb);
g_source_remove(err_cb);
- g_io_channel_close (read_chan);
+ g_io_channel_shutdown (read_chan, TRUE, NULL);
g_io_channel_unref (read_chan);
- g_io_channel_close (write_chan);
+ g_io_channel_shutdown (write_chan, TRUE, NULL);
g_io_channel_unref (write_chan);
g_spawn_close_pid(gnuchess_pid);
diff --git a/src/click_on_letter-activity/click_on_letter.c b/src/click_on_letter-activity/click_on_letter.c
index 10b9666..20605fd 100644
--- a/src/click_on_letter-activity/click_on_letter.c
+++ b/src/click_on_letter-activity/click_on_letter.c
@@ -182,7 +182,7 @@ static void start_board (GcomprisBoard *agcomprisBoard)
{
gcomprisBoard=agcomprisBoard;
- if ( gcomprisBoard->mode && g_strcasecmp(gcomprisBoard->mode, "uppercase")==0 )
+ if ( gcomprisBoard->mode && g_ascii_strcasecmp(gcomprisBoard->mode, "uppercase")==0 )
uppercase_only = TRUE;
else
uppercase_only = FALSE;
@@ -303,7 +303,7 @@ static gboolean is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "click_on_letter")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "click_on_letter")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
diff --git a/src/clickgame-activity/clickgame.c b/src/clickgame-activity/clickgame.c
index 5c474b2..d536d69 100644
--- a/src/clickgame-activity/clickgame.c
+++ b/src/clickgame-activity/clickgame.c
@@ -404,7 +404,7 @@ clickgame_is_our_board (GcomprisBoard *board)
{
if (board)
{
- if(g_strcasecmp(board->type, "clickgame")==0)
+ if(g_ascii_strcasecmp(board->type, "clickgame")==0)
{
/* Set the plugin entry */
board->plugin=&menu_bp;
diff --git a/src/clockgame-activity/clockgame.c b/src/clockgame-activity/clockgame.c
index b3bb2ec..88394f9 100644
--- a/src/clockgame-activity/clockgame.c
+++ b/src/clockgame-activity/clockgame.c
@@ -203,7 +203,7 @@ is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "clockgame")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "clockgame")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
diff --git a/src/crane-activity/crane.c b/src/crane-activity/crane.c
index 98f1e74..1bc8b66 100644
--- a/src/crane-activity/crane.c
+++ b/src/crane-activity/crane.c
@@ -251,7 +251,7 @@ static gboolean is_our_board (GcomprisBoard *gcomprisBoard) {
if (gcomprisBoard) {
- if (g_strcasecmp(gcomprisBoard->type, "crane") == 0) {
+ if (g_ascii_strcasecmp(gcomprisBoard->type, "crane") == 0) {
/* Set the plugin entry */
gcomprisBoard->plugin = &menu_bp;
diff --git a/src/enumerate-activity/enumerate.c b/src/enumerate-activity/enumerate.c
index a9e5d8d..a40505d 100644
--- a/src/enumerate-activity/enumerate.c
+++ b/src/enumerate-activity/enumerate.c
@@ -303,7 +303,7 @@ static gboolean is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "enumerate")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "enumerate")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
diff --git a/src/erase-activity/erase.c b/src/erase-activity/erase.c
index f08098c..dbadb53 100644
--- a/src/erase-activity/erase.c
+++ b/src/erase-activity/erase.c
@@ -233,7 +233,7 @@ static gboolean is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "erase")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "erase")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
diff --git a/src/fifteen-activity/fifteen.c b/src/fifteen-activity/fifteen.c
index d8bbf7d..9ef1767 100644
--- a/src/fifteen-activity/fifteen.c
+++ b/src/fifteen-activity/fifteen.c
@@ -144,7 +144,7 @@ static gboolean is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "fifteen")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "fifteen")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
diff --git a/src/gcompris/images_selector.c b/src/gcompris/images_selector.c
index bc5a157..72d501b 100644
--- a/src/gcompris/images_selector.c
+++ b/src/gcompris/images_selector.c
@@ -777,7 +777,7 @@ read_xml_file(gchar *fname)
/* if it doesn't have a name */
!doc->children->name ||
/* if it isn't the good node */
- g_strcasecmp((gchar *)doc->children->name, "ImageSetRoot")!=0) {
+ g_ascii_strcasecmp((gchar *)doc->children->name, "ImageSetRoot")!=0) {
xmlFreeDoc(doc);
return FALSE;
}
@@ -842,7 +842,7 @@ read_dataset_directory(gchar *dataset_dir)
/* if it doesn't have a name */
!doc->children->name ||
/* if it isn't the good node */
- g_strcasecmp((gchar *)doc->children->name, "ImageSetRoot")!=0) {
+ g_ascii_strcasecmp((gchar *)doc->children->name, "ImageSetRoot")!=0) {
xmlFreeDoc(doc);
g_free(absolute_fname);
continue;
diff --git a/src/gcompris/menu.c b/src/gcompris/menu.c
index 009f615..be393c1 100644
--- a/src/gcompris/menu.c
+++ b/src/gcompris/menu.c
@@ -60,7 +60,7 @@ _add_xml_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child,
if(/* if the node has no name */
!xmlnode->name ||
/* or if the name is not "Board" */
- (g_strcasecmp((char *)xmlnode->name,"Board")!=0)
+ (g_ascii_strcasecmp((char *)xmlnode->name,"Board")!=0)
)
return;
@@ -302,7 +302,7 @@ _read_xml_file(GcomprisBoard *gcomprisBoard,
/* if it doesn't have a name */
!doc->children->name ||
/* if it isn't a GCompris node */
- g_strcasecmp((char *)doc->children->name,"GCompris")!=0) {
+ g_ascii_strcasecmp((char *)doc->children->name,"GCompris")!=0) {
xmlFreeDoc(doc);
g_free(gcomprisBoard);
g_warning("Oops, the file %s is not for gcompris", filename);
@@ -649,7 +649,7 @@ void gc_menu_load()
/* use GTimeVal for portability */
GDate *today = g_date_new();
-#if (GLIB_MAJOR_VERSION > 2) && (GLIB_MINOR_VERSION > 10)
+#if GLIB_CHECK_VERSION(2, 10, 0)
GTimeVal now;
g_get_current_time (&now);
diff --git a/src/gcompris/skin.c b/src/gcompris/skin.c
index 4abe176..8f4d4d0 100644
--- a/src/gcompris/skin.c
+++ b/src/gcompris/skin.c
@@ -343,7 +343,7 @@ skin_xml_load (gchar* skin)
/* if it doesn't have a name */
!xmldoc->children->name ||
/* if it isn't a GCompris node */
- g_strcasecmp((gchar *)xmldoc->children->name, "GCompris")!=0) {
+ g_ascii_strcasecmp((gchar *)xmldoc->children->name, "GCompris")!=0) {
xmlFreeDoc(xmldoc);
g_warning("Skin file is not properly formatted (no GCompris node) '%s' !",
skin);
@@ -355,7 +355,7 @@ skin_xml_load (gchar* skin)
skinNode = skinNode->next;
if((skinNode==NULL)||
- g_strcasecmp((gchar *)skinNode->name, "Skin")!=0) {
+ g_ascii_strcasecmp((gchar *)skinNode->name, "Skin")!=0) {
g_warning("In skin file '%s' there are no Skin node %s", skin,
xmldoc->children->children->name);
xmlFreeDoc(xmldoc);
@@ -365,7 +365,7 @@ skin_xml_load (gchar* skin)
node = skinNode->children;
while(node !=NULL)
{
- if(g_strcasecmp((gchar *)node->name, "color")==0){
+ if(g_ascii_strcasecmp((gchar *)node->name, "color")==0){
key = (gchar *)xmlGetProp(node, BAD_CAST "id");
data =(gchar *) xmlGetProp(node, BAD_CAST "rgba");
if((key!=NULL)&&(data!=NULL)){
@@ -377,7 +377,7 @@ skin_xml_load (gchar* skin)
}
if(data!=NULL) g_free(data);
}
- else if(g_strcasecmp((gchar *)node->name, "font")==0){
+ else if(g_ascii_strcasecmp((gchar *)node->name, "font")==0){
key = (gchar *)xmlGetProp(node, BAD_CAST "id");
data = (gchar *)xmlGetProp(node, BAD_CAST "name");
if((key!=NULL)&&(data!=NULL)){
@@ -387,7 +387,7 @@ skin_xml_load (gchar* skin)
if(data!=NULL) g_free(data);
}
}
- else if(g_strcasecmp((gchar *)node->name, "number")==0){
+ else if(g_ascii_strcasecmp((gchar *)node->name, "number")==0){
key = (gchar *)xmlGetProp(node, BAD_CAST "id");
data = (gchar *)xmlGetProp(node, BAD_CAST "value");
if((key!=NULL)&&(data!=NULL)){
diff --git a/src/gcompris/wordlist.c b/src/gcompris/wordlist.c
index ff90f7e..66eb5d6 100644
--- a/src/gcompris/wordlist.c
+++ b/src/gcompris/wordlist.c
@@ -103,7 +103,7 @@ GcomprisWordlist
/* if it doesn't have a name */
!xmldoc->children->name ||
/* if it isn't a GCompris node */
- g_strcasecmp((gchar *)xmldoc->children->name,(gchar *)"GCompris")!=0) {
+ g_ascii_strcasecmp((gchar *)xmldoc->children->name,(gchar *)"GCompris")!=0) {
g_warning("No Gcompris node");
xmlFreeDoc(xmldoc);
g_free(filename);
@@ -116,7 +116,7 @@ GcomprisWordlist
wlNode = wlNode->next;
if((wlNode==NULL)||
- g_strcasecmp((gchar *)wlNode->name,"Wordlist")!=0) {
+ g_ascii_strcasecmp((gchar *)wlNode->name,"Wordlist")!=0) {
g_warning("No wordlist node %s", (wlNode == NULL) ? (gchar *)wlNode->name : "NULL node");
xmlFreeDoc(xmldoc);
g_free(filename);
diff --git a/src/gletters-activity/gletters.c b/src/gletters-activity/gletters.c
index cfbb441..a6c6a01 100644
--- a/src/gletters-activity/gletters.c
+++ b/src/gletters-activity/gletters.c
@@ -458,7 +458,7 @@ is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "gletters")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "gletters")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
diff --git a/src/hanoi-activity/hanoi.c b/src/hanoi-activity/hanoi.c
index f054b5c..11d1b45 100644
--- a/src/hanoi-activity/hanoi.c
+++ b/src/hanoi-activity/hanoi.c
@@ -211,7 +211,7 @@ static gboolean is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "hanoi")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "hanoi")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
diff --git a/src/hanoi_real-activity/hanoi_real.c b/src/hanoi_real-activity/hanoi_real.c
index 3cb9fe0..6dcd7ea 100644
--- a/src/hanoi_real-activity/hanoi_real.c
+++ b/src/hanoi_real-activity/hanoi_real.c
@@ -171,7 +171,7 @@ static gboolean is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "hanoi_real")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "hanoi_real")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
diff --git a/src/imageid-activity/imageid.c b/src/imageid-activity/imageid.c
index 472572d..fa83bd6 100644
--- a/src/imageid-activity/imageid.c
+++ b/src/imageid-activity/imageid.c
@@ -214,7 +214,7 @@ is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "imageid")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "imageid")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
@@ -573,7 +573,7 @@ parse_doc(xmlDocPtr doc)
xmlNodePtr node;
for(node = doc->children->children; node != NULL; node = node->next) {
- if ( g_strcasecmp((gchar *)node->name, "Board") == 0 )
+ if ( g_ascii_strcasecmp((gchar *)node->name, "Board") == 0 )
add_xml_data(doc, node, NULL);
}
@@ -601,7 +601,7 @@ read_xml_file(char *fname)
/* if it doesn't have a name */
!doc->children->name ||
/* if it isn't a ImageId node */
- g_strcasecmp((char *)doc->children->name,"ImageId")!=0) {
+ g_ascii_strcasecmp((char *)doc->children->name,"ImageId")!=0) {
xmlFreeDoc(doc);
return FALSE;
}
diff --git a/src/leftright-activity/leftright.c b/src/leftright-activity/leftright.c
index 82e7c83..ad42bb0 100644
--- a/src/leftright-activity/leftright.c
+++ b/src/leftright-activity/leftright.c
@@ -180,7 +180,7 @@ static void set_level (guint level) {
* =====================================================================*/
static gboolean is_our_board (GcomprisBoard *gcomprisBoard) {
if (gcomprisBoard) {
- if(g_strcasecmp(gcomprisBoard->type, "leftright")==0) {
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "leftright")==0) {
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
return TRUE;
diff --git a/src/magic_hat_minus-activity/magic_hat.c b/src/magic_hat_minus-activity/magic_hat.c
index 68add83..4a61ba2 100644
--- a/src/magic_hat_minus-activity/magic_hat.c
+++ b/src/magic_hat_minus-activity/magic_hat.c
@@ -250,7 +250,7 @@ static gboolean is_our_board (GcomprisBoard *gcomprisBoard) {
if (gcomprisBoard) {
- if (g_strcasecmp(gcomprisBoard->type, "magic_hat") == 0) {
+ if (g_ascii_strcasecmp(gcomprisBoard->type, "magic_hat") == 0) {
/* Set the plugin entry */
gcomprisBoard->plugin = &menu_bp;
diff --git a/src/maze-activity/maze.c b/src/maze-activity/maze.c
index 184915a..166b849 100644
--- a/src/maze-activity/maze.c
+++ b/src/maze-activity/maze.c
@@ -198,16 +198,16 @@ static void start_board (GcomprisBoard *agcomprisBoard) {
modeIsInvisible=FALSE;
if(!gcomprisBoard->mode)
modeIs2D=TRUE;
- else if(g_strncasecmp(gcomprisBoard->mode, "2DR", 3)==0) {
+ else if(g_ascii_strncasecmp(gcomprisBoard->mode, "2DR", 3)==0) {
/* 2D Relative */
modeIs2D=TRUE;
modeRelative=TRUE;
- } else if(g_strncasecmp(gcomprisBoard->mode, "2DI", 3)==0) {
+ } else if(g_ascii_strncasecmp(gcomprisBoard->mode, "2DI", 3)==0) {
modeIs2D=TRUE;
modeIsInvisible=TRUE;
- } else if(g_strncasecmp(gcomprisBoard->mode, "2D", 2)==0) {
+ } else if(g_ascii_strncasecmp(gcomprisBoard->mode, "2D", 2)==0) {
modeIs2D=TRUE;
- } else if(g_strncasecmp(gcomprisBoard->mode, "3D", 2)==0) {
+ } else if(g_ascii_strncasecmp(gcomprisBoard->mode, "3D", 2)==0) {
modeIs2D=FALSE;
}
@@ -251,7 +251,7 @@ static void end_board () {
* =====================================================================*/
static gboolean is_our_board (GcomprisBoard *gcomprisBoard) {
if (gcomprisBoard) {
- if(g_strcasecmp(gcomprisBoard->type, "maze")==0) {
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "maze")==0) {
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
return TRUE;
diff --git a/src/memory-activity/memory.c b/src/memory-activity/memory.c
index d75d3c6..deb8ebb 100644
--- a/src/memory-activity/memory.c
+++ b/src/memory-activity/memory.c
@@ -749,107 +749,107 @@ static void start_board (GcomprisBoard *agcomprisBoard)
currentUiMode=UIMODE_NORMAL;
currentBoardMode=BOARDMODE_NORMAL;
} else {
- if(g_strcasecmp(gcomprisBoard->mode, "tux")==0){
+ if(g_ascii_strcasecmp(gcomprisBoard->mode, "tux")==0){
currentMode=MODE_TUX;
currentUiMode=UIMODE_NORMAL;
currentBoardMode=BOARDMODE_NORMAL;
} else {
- if(g_strcasecmp(gcomprisBoard->mode, "sound")==0){
+ if(g_ascii_strcasecmp(gcomprisBoard->mode, "sound")==0){
currentMode=MODE_NORMAL;
currentUiMode=UIMODE_SOUND;
currentBoardMode=BOARDMODE_SOUND;
} else {
- if(g_strcasecmp(gcomprisBoard->mode, "sound_tux")==0){
+ if(g_ascii_strcasecmp(gcomprisBoard->mode, "sound_tux")==0){
currentMode=MODE_TUX;
currentUiMode=UIMODE_SOUND;
currentBoardMode=BOARDMODE_SOUND;
} else {
- if(g_strcasecmp(gcomprisBoard->mode, "add")==0){
+ if(g_ascii_strcasecmp(gcomprisBoard->mode, "add")==0){
currentMode=MODE_NORMAL;
currentUiMode=UIMODE_NORMAL;
currentBoardMode=BOARDMODE_ADD;
} else {
- if(g_strcasecmp(gcomprisBoard->mode, "add_tux")==0){
+ if(g_ascii_strcasecmp(gcomprisBoard->mode, "add_tux")==0){
currentMode=MODE_TUX;
currentUiMode=UIMODE_NORMAL;
currentBoardMode=BOARDMODE_ADD;
} else {
- if(g_strcasecmp(gcomprisBoard->mode, "minus")==0){
+ if(g_ascii_strcasecmp(gcomprisBoard->mode, "minus")==0){
currentMode=MODE_NORMAL;
currentUiMode=UIMODE_NORMAL;
currentBoardMode=BOARDMODE_MINUS;
} else {
- if(g_strcasecmp(gcomprisBoard->mode, "minus_tux")==0){
+ if(g_ascii_strcasecmp(gcomprisBoard->mode, "minus_tux")==0){
currentMode=MODE_TUX;
currentUiMode=UIMODE_NORMAL;
currentBoardMode=BOARDMODE_MINUS;
} else {
- if(g_strcasecmp(gcomprisBoard->mode, "mult")==0){
+ if(g_ascii_strcasecmp(gcomprisBoard->mode, "mult")==0){
currentMode=MODE_NORMAL;
currentUiMode=UIMODE_NORMAL;
currentBoardMode=BOARDMODE_MULT;
} else {
- if(g_strcasecmp(gcomprisBoard->mode, "mult_tux")==0){
+ if(g_ascii_strcasecmp(gcomprisBoard->mode, "mult_tux")==0){
currentMode=MODE_TUX;
currentUiMode=UIMODE_NORMAL;
currentBoardMode=BOARDMODE_MULT;
} else {
- if(g_strcasecmp(gcomprisBoard->mode, "div")==0){
+ if(g_ascii_strcasecmp(gcomprisBoard->mode, "div")==0){
currentMode=MODE_NORMAL;
currentUiMode=UIMODE_NORMAL;
currentBoardMode=BOARDMODE_DIV;
} else {
- if(g_strcasecmp(gcomprisBoard->mode, "div_tux")==0){
+ if(g_ascii_strcasecmp(gcomprisBoard->mode, "div_tux")==0){
currentMode=MODE_TUX;
currentUiMode=UIMODE_NORMAL;
currentBoardMode=BOARDMODE_DIV;
} else {
- if(g_strcasecmp(gcomprisBoard->mode, "add_minus")==0){
+ if(g_ascii_strcasecmp(gcomprisBoard->mode, "add_minus")==0){
currentMode=MODE_NORMAL;
currentUiMode=UIMODE_NORMAL;
currentBoardMode=BOARDMODE_ADD_MINUS;
} else {
- if(g_strcasecmp(gcomprisBoard->mode, "add_minus_tux")==0){
+ if(g_ascii_strcasecmp(gcomprisBoard->mode, "add_minus_tux")==0){
currentMode=MODE_TUX;
currentUiMode=UIMODE_NORMAL;
currentBoardMode=BOARDMODE_ADD_MINUS;
} else {
- if(g_strcasecmp(gcomprisBoard->mode, "mult_div")==0){
+ if(g_ascii_strcasecmp(gcomprisBoard->mode, "mult_div")==0){
currentMode=MODE_NORMAL;
currentUiMode=UIMODE_NORMAL;
currentBoardMode=BOARDMODE_MULT_DIV;
} else {
- if(g_strcasecmp(gcomprisBoard->mode, "mult_div_tux")==0){
+ if(g_ascii_strcasecmp(gcomprisBoard->mode, "mult_div_tux")==0){
currentMode=MODE_TUX;
currentUiMode=UIMODE_NORMAL;
currentBoardMode=BOARDMODE_MULT_DIV;
} else {
- if(g_strcasecmp(gcomprisBoard->mode, "add_minus_mult_div")==0){
+ if(g_ascii_strcasecmp(gcomprisBoard->mode, "add_minus_mult_div")==0){
currentMode=MODE_NORMAL;
currentUiMode=UIMODE_NORMAL;
currentBoardMode=BOARDMODE_ADD_MINUS_MULT_DIV;
} else {
- if(g_strcasecmp(gcomprisBoard->mode, "add_minus_mult_div_tux")==0){
+ if(g_ascii_strcasecmp(gcomprisBoard->mode, "add_minus_mult_div_tux")==0){
currentMode=MODE_TUX;
currentUiMode=UIMODE_NORMAL;
currentBoardMode=BOARDMODE_ADD_MINUS_MULT_DIV;
} else {
- if(g_strcasecmp(gcomprisBoard->mode, "enumerate")==0){
+ if(g_ascii_strcasecmp(gcomprisBoard->mode, "enumerate")==0){
currentMode=MODE_NORMAL;
currentUiMode=UIMODE_NORMAL;
currentBoardMode=BOARDMODE_ENUMERATE;
} else {
- if(g_strcasecmp(gcomprisBoard->mode, "enumerate_tux")==0){
+ if(g_ascii_strcasecmp(gcomprisBoard->mode, "enumerate_tux")==0){
currentMode=MODE_TUX;
currentUiMode=UIMODE_NORMAL;
currentBoardMode=BOARDMODE_ENUMERATE;
} else {
- if(g_strcasecmp(gcomprisBoard->mode, "wordnumber")==0){
+ if(g_ascii_strcasecmp(gcomprisBoard->mode, "wordnumber")==0){
currentMode=MODE_NORMAL;
currentUiMode=UIMODE_NORMAL;
currentBoardMode=BOARDMODE_WORDNUMBER;
} else {
- if(g_strcasecmp(gcomprisBoard->mode, "wordnumber_tux")==0){
+ if(g_ascii_strcasecmp(gcomprisBoard->mode, "wordnumber_tux")==0){
currentMode=MODE_TUX;
currentUiMode=UIMODE_NORMAL;
currentBoardMode=BOARDMODE_WORDNUMBER;
@@ -1021,7 +1021,7 @@ is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "memory")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "memory")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
diff --git a/src/missing_letter-activity/missingletter.c b/src/missing_letter-activity/missingletter.c
index e5ece82..124685e 100644
--- a/src/missing_letter-activity/missingletter.c
+++ b/src/missing_letter-activity/missingletter.c
@@ -215,7 +215,7 @@ is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "missingletter")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "missingletter")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
@@ -649,13 +649,13 @@ gboolean missing_read_xml_file(char *fname, GList **list)
/* if it doesn't have a name */
!doc->children->name ||
/* if it isn't a missing letter node */
- g_strcasecmp((char *)doc->children->name,"missing_letter")!=0) {
+ g_ascii_strcasecmp((char *)doc->children->name,"missing_letter")!=0) {
xmlFreeDoc(doc);
return FALSE;
}
for(node = doc->children->children; node != NULL; node = node->next) {
- if ( g_strcasecmp((gchar *)node->name, "Board") == 0 )
+ if ( g_ascii_strcasecmp((gchar *)node->name, "Board") == 0 )
add_xml_data(doc, node, list);
}
xmlFreeDoc(doc);
diff --git a/src/money-activity/money.c b/src/money-activity/money.c
index b5909ab..8b73126 100644
--- a/src/money-activity/money.c
+++ b/src/money-activity/money.c
@@ -214,7 +214,7 @@ gboolean is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "money")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "money")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
diff --git a/src/paratrooper-activity/paratrooper.c b/src/paratrooper-activity/paratrooper.c
index 118ddbf..e361b72 100644
--- a/src/paratrooper-activity/paratrooper.c
+++ b/src/paratrooper-activity/paratrooper.c
@@ -262,7 +262,7 @@ is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "paratrooper")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "paratrooper")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
diff --git a/src/photohunter-activity/photohunter.c b/src/photohunter-activity/photohunter.c
index baac76e..a2268ca 100644
--- a/src/photohunter-activity/photohunter.c
+++ b/src/photohunter-activity/photohunter.c
@@ -203,7 +203,7 @@ static gboolean is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "photohunter")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "photohunter")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
diff --git a/src/planegame-activity/planegame.c b/src/planegame-activity/planegame.c
index 351b7fd..4c98bbd 100644
--- a/src/planegame-activity/planegame.c
+++ b/src/planegame-activity/planegame.c
@@ -231,7 +231,7 @@ is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "planegame")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "planegame")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
diff --git a/src/railroad-activity/railroad.c b/src/railroad-activity/railroad.c
index 56f7017..98f89f0 100644
--- a/src/railroad-activity/railroad.c
+++ b/src/railroad-activity/railroad.c
@@ -234,7 +234,7 @@ gboolean is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "railroad")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "railroad")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
diff --git a/src/readingh-activity/reading.c b/src/readingh-activity/reading.c
index 0e6d66b..dca4001 100644
--- a/src/readingh-activity/reading.c
+++ b/src/readingh-activity/reading.c
@@ -233,7 +233,7 @@ static void start_board (GcomprisBoard *agcomprisBoard)
currentMode=MODE_VERTICAL; // Default mode
- if(gcomprisBoard->mode && g_strcasecmp(gcomprisBoard->mode, "horizontal")==0)
+ if(gcomprisBoard->mode && g_ascii_strcasecmp(gcomprisBoard->mode, "horizontal")==0)
{
if (pango_unichar_direction(g_utf8_get_char(gc_wordlist_random_word_get(gc_wordlist, gcomprisBoard->level))) == PANGO_DIRECTION_RTL)
currentMode=MODE_HORIZONTAL_RTL;
@@ -281,7 +281,7 @@ is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "reading")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "reading")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
diff --git a/src/reversecount-activity/reversecount.c b/src/reversecount-activity/reversecount.c
index d468304..2cb6032 100644
--- a/src/reversecount-activity/reversecount.c
+++ b/src/reversecount-activity/reversecount.c
@@ -238,7 +238,7 @@ gboolean is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "reversecount")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "reversecount")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
diff --git a/src/scalesboard-activity/scale.c b/src/scalesboard-activity/scale.c
index 0470e98..734b2d2 100644
--- a/src/scalesboard-activity/scale.c
+++ b/src/scalesboard-activity/scale.c
@@ -231,7 +231,7 @@ set_level (guint level)
gboolean is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
- if(g_strcasecmp(gcomprisBoard->type, "scale")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "scale")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
@@ -1128,7 +1128,7 @@ conf_ok(GHashTable *table)
gchar *drag_mode_str = g_hash_table_lookup( config, "drag_mode");
- if (drag_mode_str && (g_strcasecmp (drag_mode_str, "NULL") != 0))
+ if (drag_mode_str && (g_ascii_strcasecmp (drag_mode_str, "NULL") != 0))
drag_mode = (gint ) g_ascii_strtod(drag_mode_str, NULL);
else
drag_mode = 0;
diff --git a/src/smallnumbers-activity/smallnumbers.c b/src/smallnumbers-activity/smallnumbers.c
index 13a94df..68e2216 100644
--- a/src/smallnumbers-activity/smallnumbers.c
+++ b/src/smallnumbers-activity/smallnumbers.c
@@ -172,7 +172,7 @@ static void start_board (GcomprisBoard *agcomprisBoard)
number_of_dices=1;
if(!gcomprisBoard->mode)
number_of_dices=1;
- else if(g_strncasecmp(gcomprisBoard->mode, "2_DICES", 7)==0) {
+ else if(g_ascii_strncasecmp(gcomprisBoard->mode, "2_DICES", 7)==0) {
/* 2 Dices mode */
number_of_dices=2;
}
@@ -260,7 +260,7 @@ is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "smallnumbers")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "smallnumbers")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
diff --git a/src/submarine-activity/submarine.c b/src/submarine-activity/submarine.c
index 114a394..cb7b3aa 100644
--- a/src/submarine-activity/submarine.c
+++ b/src/submarine-activity/submarine.c
@@ -317,7 +317,7 @@ static void set_level (guint level) {
* =====================================================================*/
static gboolean is_our_board (GcomprisBoard *gcomprisBoard) {
if (gcomprisBoard) {
- if(g_strcasecmp(gcomprisBoard->type, "submarine")==0) {
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "submarine")==0) {
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
return TRUE;
diff --git a/src/superbrain-activity/superbrain.c b/src/superbrain-activity/superbrain.c
index 296f18e..8dae4f9 100644
--- a/src/superbrain-activity/superbrain.c
+++ b/src/superbrain-activity/superbrain.c
@@ -203,7 +203,7 @@ static gboolean is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "superbrain")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "superbrain")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
diff --git a/src/tangram-activity/gtans.c b/src/tangram-activity/gtans.c
index 06cd0b1..d99a154 100644
--- a/src/tangram-activity/gtans.c
+++ b/src/tangram-activity/gtans.c
@@ -121,7 +121,7 @@ is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "tangram")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "tangram")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
diff --git a/src/target-activity/target.c b/src/target-activity/target.c
index 1bf3b29..da6bd9f 100644
--- a/src/target-activity/target.c
+++ b/src/target-activity/target.c
@@ -310,7 +310,7 @@ static gboolean is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "target")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "target")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
diff --git a/src/traffic-activity/traffic.c b/src/traffic-activity/traffic.c
index 35a64d9..3323401 100644
--- a/src/traffic-activity/traffic.c
+++ b/src/traffic-activity/traffic.c
@@ -205,7 +205,7 @@ static gboolean is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "traffic")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "traffic")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
diff --git a/src/wordprocessor-activity/wordprocessor.c b/src/wordprocessor-activity/wordprocessor.c
index 5f8958c..dde2ac2 100644
--- a/src/wordprocessor-activity/wordprocessor.c
+++ b/src/wordprocessor-activity/wordprocessor.c
@@ -283,7 +283,7 @@ static gboolean is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "wordprocessor")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "wordprocessor")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
@@ -1024,7 +1024,7 @@ load_buffer(gchar *file, gchar *file_type, void *unused)
node = xmlDocGetRootElement(doc);
for(node = node; node != NULL; node = node->next)
- if ( g_strcasecmp((char *)node->name, "html") == 0 &&
+ if ( g_ascii_strcasecmp((char *)node->name, "html") == 0 &&
node->children )
break;
@@ -1033,20 +1033,20 @@ load_buffer(gchar *file, gchar *file_type, void *unused)
for(node = node->children; node != NULL; node = node->next)
{
- if ( g_strcasecmp((char *)node->name, "head") == 0 &&
+ if ( g_ascii_strcasecmp((char *)node->name, "head") == 0 &&
node->children )
{
/* Search and apply the saved style in the META */
xmlNodePtr snode;
for(snode = node->children; snode != NULL; snode = snode->next)
{
- if ( ( g_strcasecmp((char *)snode->name, "meta") == 0 ) &&
+ if ( ( g_ascii_strcasecmp((char *)snode->name, "meta") == 0 ) &&
xmlHasProp(snode, BAD_CAST "http-equiv") )
{
xmlChar *key = xmlGetProp(snode, BAD_CAST "http-equiv");
xmlChar *content = xmlGetProp(snode, BAD_CAST "content");
- if(g_strcasecmp((char *)key, "GCompris-doctype") == 0)
+ if(g_ascii_strcasecmp((char *)key, "GCompris-doctype") == 0)
{
int style_index = get_style_index(gettext((char *)content));
apply_style(style_index);
@@ -1054,7 +1054,7 @@ load_buffer(gchar *file, gchar *file_type, void *unused)
style_index);
}
- if(g_strcasecmp((char *)key, "GCompris-color-style") == 0)
+ if(g_ascii_strcasecmp((char *)key, "GCompris-color-style") == 0)
{
int cstyle_index = get_color_style_index(gettext((char *)content));
apply_color_style(cstyle_index);
@@ -1068,7 +1068,7 @@ load_buffer(gchar *file, gchar *file_type, void *unused)
}
}
- if ( g_strcasecmp((char *)node->name, "body") == 0 &&
+ if ( g_ascii_strcasecmp((char *)node->name, "body") == 0 &&
node->children )
break;
}
@@ -1090,10 +1090,10 @@ load_buffer(gchar *file, gchar *file_type, void *unused)
for(node = node->children; node != NULL; node = node->next)
{
- if ( g_strcasecmp((char *)node->name, "h1") == 0 ||
- g_strcasecmp((char *)node->name, "h2") == 0 ||
- g_strcasecmp((char *)node->name, "h3") == 0 ||
- g_strcasecmp((char *)node->name, "p") == 0 )
+ if ( g_ascii_strcasecmp((char *)node->name, "h1") == 0 ||
+ g_ascii_strcasecmp((char *)node->name, "h2") == 0 ||
+ g_ascii_strcasecmp((char *)node->name, "h3") == 0 ||
+ g_ascii_strcasecmp((char *)node->name, "p") == 0 )
{
xmlChar *content;
content = xmlNodeGetContent(node);
diff --git a/src/wordsgame-activity/wordsgame.c b/src/wordsgame-activity/wordsgame.c
index 5762733..18a03fe 100644
--- a/src/wordsgame-activity/wordsgame.c
+++ b/src/wordsgame-activity/wordsgame.c
@@ -435,7 +435,7 @@ is_our_board (GcomprisBoard *gcomprisBoard)
{
if (gcomprisBoard)
{
- if(g_strcasecmp(gcomprisBoard->type, "wordsgame")==0)
+ if(g_ascii_strcasecmp(gcomprisBoard->type, "wordsgame")==0)
{
/* Set the plugin entry */
gcomprisBoard->plugin=&menu_bp;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
