Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Coudoin <bcoudoin@src.gnome.org>2002-01-13 20:24:45 (GMT)
committer Bruno Coudoin <bcoudoin@src.gnome.org>2002-01-13 20:24:45 (GMT)
commit819352f3315ff996248652f743306e6ad9cd8d98 (patch)
treeb49b14d2bd7b3a08df24f2e746a776b037b2c612
parentaf7b92783aaacdd0185aa79d10629fc0c28adee5 (diff)
removed help from plugins. New it is in the xml.
Fixed gameutil to fix \ n in utf parsing
-rw-r--r--gcompris.desktop.in2
-rw-r--r--gcompris.spec.in15
-rw-r--r--src/boards/algebra.c5
-rw-r--r--src/boards/algebra_guesscount.c3
-rw-r--r--src/boards/click_on_letter.c3
-rw-r--r--src/boards/clickgame.c18
-rw-r--r--src/boards/clockgame.c5
-rw-r--r--src/boards/draw.c8
-rw-r--r--src/boards/erase.c3
-rw-r--r--src/boards/gletters.c5
-rw-r--r--src/boards/imageid.c3
-rw-r--r--src/boards/memory.c5
-rw-r--r--src/boards/menu.c20
-rw-r--r--src/boards/missingletter.c3
-rw-r--r--src/boards/paratrooper.c8
-rw-r--r--src/boards/planegame.c5
-rw-r--r--src/boards/railroad.c3
-rw-r--r--src/boards/reading.c5
-rw-r--r--src/boards/shapegame.c5
-rw-r--r--src/boards/smallnumbers.c5
-rw-r--r--src/boards/wordsgame.c5
-rw-r--r--src/gcompris/about.c8
-rw-r--r--src/gcompris/gameutil.c17
-rw-r--r--src/gcompris/gcompris.c12
-rw-r--r--src/gcompris/help.c25
-rw-r--r--src/gcompris/plugin.h5
26 files changed, 47 insertions, 154 deletions
diff --git a/gcompris.desktop.in b/gcompris.desktop.in
index 7d47845..831bc32 100644
--- a/gcompris.desktop.in
+++ b/gcompris.desktop.in
@@ -1,5 +1,5 @@
[Desktop Entry]
-_Name=GCompris
+Name=GCompris
_Comment=Educational game starting at 3 years old
Exec=gcompris
Icon=gcompris.png
diff --git a/gcompris.spec.in b/gcompris.spec.in
index 62f5188..582eb2f 100644
--- a/gcompris.spec.in
+++ b/gcompris.spec.in
@@ -107,7 +107,7 @@ xml-i18n-tools, gdk-pixbuf doivent être installés.
%package sounds-fr
Summary: French sounds for GCompris
Group: Amusements/Games
-Requires: %name = %version
+Requires: %name
%description sounds-fr
French sounds for gcompris.
@@ -115,7 +115,7 @@ French sounds for gcompris.
%package sounds-es
Summary: Spanish sounds for GCompris
Group: Amusements/Games
-Requires: %name = %version
+Requires: %name
%description sounds-es
Spanish sounds for gcompris.
@@ -123,7 +123,7 @@ Spanish sounds for gcompris.
%package sounds-de
Summary: German sounds for GCompris
Group: Amusements/Games
-Requires: %name = %version
+Requires: %name
%description sounds-de
German sounds for gcompris.
@@ -131,7 +131,7 @@ German sounds for gcompris.
%package sounds-en
Summary: English sounds for GCompris
Group: Amusements/Games
-Requires: %name = %version
+Requires: %name
%description sounds-en
English sounds for gcompris.
@@ -179,7 +179,6 @@ rm -rf $RPM_BUILD_ROOT
%{prefix}/share/gcompris/boards/babyshapes/*
%{prefix}/share/gcompris/boards/boardicons/*
%{prefix}/share/gcompris/boards/clockgame/*
-%{prefix}/share/gcompris/boards/CVS/*
%{prefix}/share/gcompris/boards/draw/*
%{prefix}/share/gcompris/boards/fishes/*
%{prefix}/share/gcompris/boards/flags/*
@@ -198,13 +197,13 @@ rm -rf $RPM_BUILD_ROOT
%{prefix}/lib/menu/*
%files sounds-de
-%{prefix}/share/gcompris/boards/sounds/fr
+%{prefix}/share/gcompris/boards/sounds/de
%files sounds-en
-%{prefix}/share/gcompris/boards/sounds/fr
+%{prefix}/share/gcompris/boards/sounds/en
%files sounds-es
-%{prefix}/share/gcompris/boards/sounds/fr
+%{prefix}/share/gcompris/boards/sounds/es
%files sounds-fr
%{prefix}/share/gcompris/boards/sounds/fr
diff --git a/src/boards/algebra.c b/src/boards/algebra.c
index 56a11fa..2b72240 100644
--- a/src/boards/algebra.c
+++ b/src/boards/algebra.c
@@ -1,6 +1,6 @@
/* gcompris - algebra.c
*
- * Time-stamp: <2002/01/11 01:26:20 bruno>
+ * Time-stamp: <2002/01/13 17:59:05 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
@@ -97,9 +97,6 @@ BoardPlugin menu_bp =
NULL,
NULL,
NULL,
- NULL,
- NULL,
- NULL,
start_board,
pause_board,
end_board,
diff --git a/src/boards/algebra_guesscount.c b/src/boards/algebra_guesscount.c
index 5eb5d70..c2e51f0 100644
--- a/src/boards/algebra_guesscount.c
+++ b/src/boards/algebra_guesscount.c
@@ -145,9 +145,6 @@ BoardPlugin menu_bp =
NULL,
NULL,
NULL,
- NULL,
- NULL,
- NULL,
start_board,
pause_board,
end_board,
diff --git a/src/boards/click_on_letter.c b/src/boards/click_on_letter.c
index 1054b0a..57001f8 100644
--- a/src/boards/click_on_letter.c
+++ b/src/boards/click_on_letter.c
@@ -75,9 +75,6 @@ BoardPlugin menu_bp =
NULL,
NULL,
NULL,
- NULL,
- NULL,
- NULL,
start_board,
pause_board,
end_board,
diff --git a/src/boards/clickgame.c b/src/boards/clickgame.c
index 9271932..d93a2e4 100644
--- a/src/boards/clickgame.c
+++ b/src/boards/clickgame.c
@@ -1,6 +1,6 @@
/* gcompris - clickgame.c
*
- * Time-stamp: <2002/01/12 22:59:28 bruno>
+ * Time-stamp: <2002/01/13 17:58:56 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
@@ -77,22 +77,6 @@ BoardPlugin clickgame_bp =
N_("Click On Me"),
N_("Left-Click with the mouse on all swimming fishes before they leave the fishtank"),
"Bruno Coudoin <bruno.coudoin@free.fr>",
- N_("Can move the mouse\n"),
- N_("In this game, the children will discover the click on the computer mouse.\n"
- "The goal is just to click with the left mouse button on the moving fish."),
- N_("Credits:\n"
- "Fish are taken from the Unix utility xfishtank.\n"
- "Images are taken from the National Undersearch Research Program (NURP) Collection "
- "at http://www.photolib.noaa.gov\n"
- "All images credit bellongs to the OAR/National Undersea Research Program (NURP).\n"
- "Except for the first image that also credits the University of North Carolina at Wilmington.\n"
- "In the gcompris level order, images information is:\n"
- "Location: Tropical Atlantic Ocean, Florida Keys (image nur00523) Photographer: D. Kesling\n"
- "Location: Florida Keys (image nur03006)\n"
- "Location: Unknown (image nur03505)\n"
- "Location: Unknown (image nur03010)\n"
- "Location: Unknown (image nur03011)\n"
- "Location: Unknown (image nur03013)"),
NULL,
NULL,
NULL,
diff --git a/src/boards/clockgame.c b/src/boards/clockgame.c
index 9f5bc1a..3351a3c 100644
--- a/src/boards/clockgame.c
+++ b/src/boards/clockgame.c
@@ -1,6 +1,6 @@
/* gcompris - clockgame.c
*
- * Time-stamp: <2002/01/12 21:59:09 bruno>
+ * Time-stamp: <2002/01/13 17:58:35 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
@@ -81,9 +81,6 @@ BoardPlugin menu_bp =
NULL,
NULL,
NULL,
- NULL,
- NULL,
- NULL,
start_board,
pause_board,
end_board,
diff --git a/src/boards/draw.c b/src/boards/draw.c
index 6415fee..858bc26 100644
--- a/src/boards/draw.c
+++ b/src/boards/draw.c
@@ -96,14 +96,6 @@ BoardPlugin menu_bp =
N_("A simple vector drawing tool"),
N_("Creative board where you can freely draw"),
"Bruno Coudoin <bruno.coudoin@free.fr>",
- N_("Needs to handle the mouse with the click easily"),
- N_("In this game, the children will be able to freely draw.\n"
- "The goal is just to discover how he can create pretty looking drawings based on "
- "basic shapes: rectangles, ellipses and lines.\n"),
- N_("On the left select a drawing tool, on the bottom select a color then click "
- "on the white area and drag to create a new shape.\n"
- "To go faster, you can use the middle mouse button to delete an object "
- "or the right button to move an object.\n"),
NULL,
NULL,
NULL,
diff --git a/src/boards/erase.c b/src/boards/erase.c
index 9228512..7bbd594 100644
--- a/src/boards/erase.c
+++ b/src/boards/erase.c
@@ -77,9 +77,6 @@ BoardPlugin menu_bp =
NULL,
NULL,
NULL,
- NULL,
- NULL,
- NULL,
start_board,
pause_board,
end_board,
diff --git a/src/boards/gletters.c b/src/boards/gletters.c
index d76315f..c17a473 100644
--- a/src/boards/gletters.c
+++ b/src/boards/gletters.c
@@ -1,6 +1,6 @@
/* gcompris - gletters.c
*
- * Time-stamp: <2002/01/11 02:53:29 bruno>
+ * Time-stamp: <2002/01/13 17:58:09 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
@@ -80,9 +80,6 @@ BoardPlugin menu_bp =
NULL,
NULL,
NULL,
- NULL,
- NULL,
- NULL,
start_board,
pause_board,
end_board,
diff --git a/src/boards/imageid.c b/src/boards/imageid.c
index f20ef85..fa21a36 100644
--- a/src/boards/imageid.c
+++ b/src/boards/imageid.c
@@ -113,9 +113,6 @@ BoardPlugin menu_bp =
NULL,
NULL,
NULL,
- NULL,
- NULL,
- NULL,
start_board,
pause_board,
end_board,
diff --git a/src/boards/memory.c b/src/boards/memory.c
index d3f439c..21ea773 100644
--- a/src/boards/memory.c
+++ b/src/boards/memory.c
@@ -1,6 +1,6 @@
/* gcompris - memory.c
*
- * Time-stamp: <2002/01/11 01:26:11 bruno>
+ * Time-stamp: <2002/01/13 17:57:52 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
@@ -236,9 +236,6 @@ BoardPlugin menu_bp =
NULL,
NULL,
NULL,
- NULL,
- NULL,
- NULL,
start_board,
pause_board,
end_board,
diff --git a/src/boards/menu.c b/src/boards/menu.c
index b89ec0d..45c2e55 100644
--- a/src/boards/menu.c
+++ b/src/boards/menu.c
@@ -1,6 +1,6 @@
/* gcompris - menu.c
*
- * Time-stamp: <2002/01/13 01:13:45 bruno>
+ * Time-stamp: <2002/01/13 17:57:41 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
@@ -79,24 +79,6 @@ BoardPlugin menu_bp =
N_("Main Menu"),
N_("Select a Board"),
"Bruno Coudoin <bruno.coudoin@free.fr>",
- N_("GCompris is an educational games that provides different activities to "
- "children from 3 to 8 years old.\n"),
- N_("The goal of gcompris is to provide a free alternative to popular proprietary edutainment software"),
- N_("To use it, a simple click on an icon brings you to a board or a menu.\n"
- "At the bottom of the screen, you have the gcompris control bar.\n"
- "From right to left, bellow is the meaning of the icons.\n"
- "Note that these icons are displayed only when available in a board:\n"
- "Home - Back to previous menu or exit gcompris if no more\n"
- "Thumb - OK, confirm your answer\n"
- "Dice - The current level is displayed. Click on it to select another level\n"
- "Music note - Ask gcompris to repeat the question\n"
- "Question Mark - The help\n"
- "Tool Box - The configuration menu\n"
- "Tux Plane - The about box\n"
- "The stars means:\n"
- "1 Star - 3 to 4 years old\n"
- "2 Stars - 5 to 6 years old\n"
- "3 Stars - 7 to 8 years old"),
NULL,
NULL,
NULL,
diff --git a/src/boards/missingletter.c b/src/boards/missingletter.c
index edd98d5..8ad8d65 100644
--- a/src/boards/missingletter.c
+++ b/src/boards/missingletter.c
@@ -107,9 +107,6 @@ BoardPlugin menu_bp =
NULL,
NULL,
NULL,
- NULL,
- NULL,
- NULL,
start_board,
pause_board,
end_board,
diff --git a/src/boards/paratrooper.c b/src/boards/paratrooper.c
index 3561b51..2036d3e 100644
--- a/src/boards/paratrooper.c
+++ b/src/boards/paratrooper.c
@@ -1,6 +1,6 @@
/* gcompris - paratrooper.c
*
- * Time-stamp: <2002/01/11 00:34:58 bruno>
+ * Time-stamp: <2002/01/13 17:57:26 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
@@ -105,12 +105,6 @@ BoardPlugin menu_bp =
N_("Paratrooper"),
N_("Manage the paratrooper to let him safely land"),
"Bruno Coudoin <bruno.coudoin@free.fr>",
- N_("This board is game oriented. It doesnt needs specific skills to play with"),
- N_("In this game, the children will try to make Tux the paratrooper lands safely on the "
- "fishing boat. He/She needs to take care of the wind side and speed.\n"
- "\n"),
- N_("Click on any keyboard key to let Tux jump. Another keypress will open the "
- "'parachute'. Alternatively, a click on the plane and the tux also works."),
NULL,
NULL,
NULL,
diff --git a/src/boards/planegame.c b/src/boards/planegame.c
index 6cafd1b..fe9fb2f 100644
--- a/src/boards/planegame.c
+++ b/src/boards/planegame.c
@@ -1,6 +1,6 @@
/* gcompris - planegame.c
*
- * Time-stamp: <2002/01/11 02:03:54 bruno>
+ * Time-stamp: <2002/01/13 17:57:09 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
@@ -79,9 +79,6 @@ BoardPlugin menu_bp =
NULL,
NULL,
NULL,
- NULL,
- NULL,
- NULL,
start_board,
pause_board,
end_board,
diff --git a/src/boards/railroad.c b/src/boards/railroad.c
index 45f5ca8..75836f0 100644
--- a/src/boards/railroad.c
+++ b/src/boards/railroad.c
@@ -99,9 +99,6 @@ BoardPlugin menu_bp =
NULL,
NULL,
NULL,
- NULL,
- NULL,
- NULL,
start_board,
pause_board,
end_board,
diff --git a/src/boards/reading.c b/src/boards/reading.c
index e3a446f..b5e49a3 100644
--- a/src/boards/reading.c
+++ b/src/boards/reading.c
@@ -1,6 +1,6 @@
/* gcompris - reading.c
*
- * Time-stamp: <2002/01/11 01:26:06 bruno>
+ * Time-stamp: <2002/01/13 17:56:46 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
@@ -102,9 +102,6 @@ BoardPlugin menu_bp =
NULL,
NULL,
NULL,
- NULL,
- NULL,
- NULL,
start_board,
pause_board,
end_board,
diff --git a/src/boards/shapegame.c b/src/boards/shapegame.c
index 6f35afd..e57c029 100644
--- a/src/boards/shapegame.c
+++ b/src/boards/shapegame.c
@@ -1,6 +1,6 @@
/* gcompris - shapegame.c
*
- * Time-stamp: <2002/01/11 01:26:05 bruno>
+ * Time-stamp: <2002/01/13 17:56:32 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
@@ -124,9 +124,6 @@ BoardPlugin menu_bp =
NULL,
NULL,
NULL,
- NULL,
- NULL,
- NULL,
start_board,
pause_board,
end_board,
diff --git a/src/boards/smallnumbers.c b/src/boards/smallnumbers.c
index f9ab7c1..ca21044 100644
--- a/src/boards/smallnumbers.c
+++ b/src/boards/smallnumbers.c
@@ -1,6 +1,6 @@
/* gcompris - smallnumbers.c
*
- * Time-stamp: <2002/01/11 01:26:02 bruno>
+ * Time-stamp: <2002/01/13 17:56:21 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
@@ -73,9 +73,6 @@ BoardPlugin menu_bp =
NULL,
NULL,
NULL,
- NULL,
- NULL,
- NULL,
start_board,
pause_board,
end_board,
diff --git a/src/boards/wordsgame.c b/src/boards/wordsgame.c
index 21ca103..837883e 100644
--- a/src/boards/wordsgame.c
+++ b/src/boards/wordsgame.c
@@ -1,6 +1,6 @@
/* gcompris - wordsgame.c
*
- * Time-stamp: <2002/01/11 01:25:50 bruno>
+ * Time-stamp: <2002/01/13 17:56:12 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
@@ -86,9 +86,6 @@ BoardPlugin menu_bp =
NULL,
NULL,
NULL,
- NULL,
- NULL,
- NULL,
start_board,
pause_board,
end_board,
diff --git a/src/gcompris/about.c b/src/gcompris/about.c
index 1177e2f..823eb5a 100644
--- a/src/gcompris/about.c
+++ b/src/gcompris/about.c
@@ -1,6 +1,6 @@
/* gcompris - about.c
*
- * Time-stamp: <2002/01/13 00:41:13 bruno>
+ * Time-stamp: <2002/01/13 19:23:26 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
@@ -146,7 +146,7 @@ void gcompris_about_start ()
item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem),
gnome_canvas_text_get_type (),
- "text", N_("OFSET"),
+ "text", "OFSET",
"font_gdk", gdk_font2,
"x", (double) (BOARDWIDTH*0.25),
"y", (double) y_start + 80,
@@ -173,7 +173,7 @@ void gcompris_about_start ()
item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem),
gnome_canvas_text_get_type (),
- "text", N_("Free Software Fundation"),
+ "text", "Free Software Fundation",
"font_gdk", gdk_font2,
"x", (double) (BOARDWIDTH*0.75),
"y", (double) y_start + 80,
@@ -212,7 +212,7 @@ void gcompris_about_start ()
// Copyright
item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem),
gnome_canvas_text_get_type (),
- "text", N_("Copyright 2000,2001,2002 Bruno Coudoin"),
+ "text", "Copyright 2000,2001,2002 Bruno Coudoin",
"font_gdk", gdk_font2,
"x", (double) BOARDWIDTH/2,
"y", (double) y - 85,
diff --git a/src/gcompris/gameutil.c b/src/gcompris/gameutil.c
index c5ef5f0..43dacf6 100644
--- a/src/gcompris/gameutil.c
+++ b/src/gcompris/gameutil.c
@@ -1,6 +1,6 @@
/* gcompris - gameutil.c
*
- * Time-stamp: <2002/01/12 22:55:39 bruno>
+ * Time-stamp: <2002/01/13 20:50:32 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
@@ -475,12 +475,14 @@ GcomprisBoard *gcompris_read_xml_file(char *fname)
/* ==================================== */
/* translates UTF8 charset to iso Latin1 */
gchar * convertUTF8Toisolat1(gchar * text) {
-#define MAX_LENGTH 512
+#define MAX_LENGTH 1024
const char *inptr;
size_t inleft;
char *outptr;
size_t outleft;
gint retval;
+ gint i;
+
// this should never happen, it does often !!
if (text == NULL)
return NULL;
@@ -495,6 +497,17 @@ gchar * convertUTF8Toisolat1(gchar * text) {
g_free(text);
text = outptr;
text[outleft]='\0';
+
+ // if we find \n on 2 char, recreate a real \n
+ i=0;
+ while(text[i++]!='\0')
+ {
+ if(text[i]=='\\' && text[i+1]=='n')
+ {
+ text[i]=' ';
+ text[i+1]='\n';
+ }
+ }
} else
g_free(outptr);
diff --git a/src/gcompris/gcompris.c b/src/gcompris/gcompris.c
index 25c28a4..63af57d 100644
--- a/src/gcompris/gcompris.c
+++ b/src/gcompris/gcompris.c
@@ -1,6 +1,6 @@
/* gcompris - gcompris.c
*
- * Time-stamp: <2002/01/12 22:58:27 bruno>
+ * Time-stamp: <2002/01/13 17:51:38 bruno>
*
* Copyright (C) 2000,2001 Bruno Coudoin
*
@@ -32,7 +32,6 @@ GnomeCanvas *canvas_bg;
//static gint pause_board_cb (GtkWidget *widget, gpointer data);
static void quit_cb (GtkWidget *widget, gpointer data);
-static void help_cb (GtkWidget *widget, gpointer data);
static gint end_board_box (void);
static gint board_widget_key_press_callback (GtkWidget *widget,
GdkEventKey *event,
@@ -305,15 +304,6 @@ static void setup_window ()
init_background();
}
-/* It implements gcompris's own way to load help in order to be
- * Package relocatable.
- * Unfortunatly, this does not supports I18N
- */
-static void help_cb (GtkWidget *widget, gpointer data)
-{
- gnome_help_goto(NULL, PACKAGE_HELP_DIR "/C/gcompris.html");
-}
-
/*
* Confirmation dialog
*/
diff --git a/src/gcompris/help.c b/src/gcompris/help.c
index 9497105..deb7785 100644
--- a/src/gcompris/help.c
+++ b/src/gcompris/help.c
@@ -1,6 +1,6 @@
/* gcompris - help.c
*
- * Time-stamp: <2002/01/13 01:07:55 bruno>
+ * Time-stamp: <2002/01/13 18:02:48 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
@@ -58,12 +58,9 @@ static gchar *manual_title = N_("Manual");
gboolean gcompris_board_has_help (GcomprisBoard *gcomprisBoard)
{
- prerequisite = (gcomprisBoard->plugin->prerequisite ? gcomprisBoard->plugin->prerequisite :
- gcomprisBoard->prerequisite);
- goal = (gcomprisBoard->plugin->goal ? gcomprisBoard->plugin->goal :
- gcomprisBoard->goal);
- manual = (gcomprisBoard->plugin->manual ? gcomprisBoard->plugin->manual :
- gcomprisBoard->manual);
+ prerequisite = gcomprisBoard->prerequisite;
+ goal = gcomprisBoard->goal;
+ manual = gcomprisBoard->manual;
return(prerequisite!=NULL || goal!=NULL || manual!=NULL);
}
@@ -82,9 +79,6 @@ void gcompris_help_start (GcomprisBoard *gcomprisBoard)
GdkFont *gdk_font;
GdkFont *gdk_font2;
gchar *name = NULL;
- gchar *prerequisite = NULL;
- gchar *goal = NULL;
- gchar *manual = NULL;
if(rootitem)
return;
@@ -95,15 +89,8 @@ void gcompris_help_start (GcomprisBoard *gcomprisBoard)
gcomprisBoard->plugin->pause_board(TRUE);
}
- /* Each of these fields can be overriden by the user xml menu file that describe its board */
- name = gcomprisBoard->name;
- prerequisite = (gcomprisBoard->plugin->prerequisite ? gcomprisBoard->plugin->prerequisite :
- gcomprisBoard->prerequisite);
- goal = (gcomprisBoard->plugin->goal ? gcomprisBoard->plugin->goal :
- gcomprisBoard->goal);
- manual = (gcomprisBoard->plugin->manual ? gcomprisBoard->plugin->manual :
- gcomprisBoard->manual);
-
+ name = gcomprisBoard->name;
+ gcompris_board_has_help(gcomprisBoard);
rootitem = \
gnome_canvas_item_new (gnome_canvas_root(gcompris_get_canvas()),
diff --git a/src/gcompris/plugin.h b/src/gcompris/plugin.h
index be202c1..f5426fd 100644
--- a/src/gcompris/plugin.h
+++ b/src/gcompris/plugin.h
@@ -1,6 +1,6 @@
/* gcompris - plugin.h
*
- * Time-stamp: <2002/01/11 00:29:06 bruno>
+ * Time-stamp: <2002/01/13 17:50:04 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
@@ -43,9 +43,6 @@ typedef struct
char *name; /* The name that describes this board */
char *description; /* The description that describes this board */
char *author; /* The author of this board */
- char *prerequisite; /* Help information */
- char *goal;
- char *manual;
void (*init) (void); /* Called when the plugin is loaded */
void (*cleanup) (void); /* Called when gcompris exit */