Release 4.0PRE3 changed desktop menu entry changed ofset logo

Release 4.0PRE3
changed desktop menu entry
changed ofset logo

8 files changed, 36 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 4507595..cb4597e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-10-07  Bruno coudoin  <bruno.coudoin@free.fr>
+
+	* configure.in: Release 4.0PRE3
+	* gcompris.desktop.in: added bugzilla, category and startup notifier information
+	* src/gcompris/about.c: (gcompris_about_start), (item_event_ok): fixed fsf and gcompris help 
+	* loading
+	* gcompris: menu entry changed to section Applications/Edutainment instead of game/toy
+	* boards/skins/default/ofsetlogo.png: replaced by the new official jumping gnu
+	
 2003-10-06  Bruno coudoin  <bruno.coudoin@free.fr>
 
 	* boards/skins/default/button.png: better looking
@@ -38,7 +47,7 @@
 	* boards/sounds/fr/colors/gcompris_colors_fr.assetml.in: fixed yellow
 	* gcompris.spec.in: fixed python requirement
 	* src/boards/colors.c: (start_board): now the repeat icon is not display if sound is 
-	available
+	* available
 	* src/boards/menu.c: (menu_create_item): manage assetml dataset in mandatory_sound_*
 	* src/gcompris/bonus.c: (gcompris_display_bonus): fixed "good job" sounds to use assetml
 	* src/gcompris/gameutil.c: (gcompris_add_xml_to_data): added mandatory_sound_dataset
@@ -48,7 +57,7 @@
 
 2003-09-26  Bruno coudoin  <bruno.coudoin@free.fr>
 
-	* configure.in: Release 4.0RC2
+	* configure.in: Release 4.0PRE2
 	* src/gcompris/soundutil.c: fixed a printf
 
 2003-09-26  Bruno coudoin  <bruno.coudoin@free.fr>
diff --git a/Makefile.am b/Makefile.am
index 2711ea0..bbb5d0b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,9 +5,9 @@ SUBDIRS = po src docs boards
 icondir=$(datadir)/pixmaps
 icon_DATA = gcompris.png gcompris-edit.png
 
-Gamesdir=$(datadir)/gnome/apps/Games
-Games_in_files = gcompris.desktop.in gcompris-edit.desktop.in
-Games_DATA = $(Games_in_files:.desktop.in=.desktop)
+Applicationsdir = $(datadir)/applications/
+Applications_in_files = gcompris.desktop.in
+Applications_DATA = gcompris.desktop
 
 Menudir=$(prefix)/lib/menu
 Menu_DATA=gcompris
@@ -15,8 +15,8 @@ Menu_DATA=gcompris
 @INTLTOOL_DESKTOP_RULE@
 
 EXTRA_DIST = \
-	$(Games_DATA) \
-	$(Games_in_files) \
+	$(Applications_DATA) \
+	$(Applications_in_files) \
 	$(icon_DATA) \
 	$(Menu_DATA) \
 	gcompris.spec \
diff --git a/boards/skins/default/ofsetlogo.png b/boards/skins/default/ofsetlogo.png
index 561eadb..28c2a37 100644
--- a/boards/skins/default/ofsetlogo.png
+++ b/boards/skins/default/ofsetlogo.png
diff --git a/gcompris b/gcompris
index a13d3d6..981d2b0 100644
--- a/gcompris
+++ b/gcompris
@@ -1,7 +1,7 @@
 ?package(gcompris):\
 	needs="x11"\
-	section="Amusement/Toys"\
+	section="Applications/Edutainment"\
 	title="GCompris"\
-	longtitle="Educational Boards"\
+	longtitle="Educational Activities starting at 3 years old"\
 	command="gcompris"\
 	icon="gcompris.png"
diff --git a/gcompris-edit.desktop.in b/gcompris-edit.desktop.in
index da39b00..8663077 100644
--- a/gcompris-edit.desktop.in
+++ b/gcompris-edit.desktop.in
@@ -1,7 +1,13 @@
 [Desktop Entry]
+Encoding=UTF-8
 Name=GCompris Editor
 _Comment=Editor for gcompris
 Exec=gcompris-edit
 Icon=gcompris-edit.png
 Terminal=0
 Type=Application
+Categories=GNOME;Application;Game;
+StartupNotify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gcompris
+X-GNOME-Bugzilla-Component=
diff --git a/gcompris.desktop.in b/gcompris.desktop.in
index b6acbe2..e21bd0b 100644
--- a/gcompris.desktop.in
+++ b/gcompris.desktop.in
@@ -1,7 +1,13 @@
 [Desktop Entry]
+Encoding=UTF-8
 _Name=Educational suite gcompris
 _Comment=Educational game starting at 3 years old
 Exec=gcompris
 Icon=gcompris.png
-Terminal=0
+Terminal=false
 Type=Application
+Categories=GNOME;Application;Game;
+StartupNotify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gcompris
+X-GNOME-Bugzilla-Component=
diff --git a/gcompris.spec.in b/gcompris.spec.in
index 0d91fed..1e3d3b0 100644
--- a/gcompris.spec.in
+++ b/gcompris.spec.in
@@ -276,7 +276,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{prefix}/share/gcompris/boards/sounds
 %{prefix}/share/gcompris/boards/sounds/*.ogg
 %{prefix}/share/gcompris/boards/sounds/HOWTO_ENCODE
-%{prefix}/share/gnome/apps/Games/*
+%{prefix}/share/applications/*
 %{prefix}/share/gnome/help/*
 %{prefix}/share/locale/*/*/*
 %{prefix}/share/pixmaps/*.png
diff --git a/src/gcompris/about.c b/src/gcompris/about.c
index 60c6af0..6d7b91e 100644
--- a/src/gcompris/about.c
+++ b/src/gcompris/about.c
@@ -1,6 +1,6 @@
 /* gcompris - about.c
  *
- * Time-stamp: <2003/08/21 16:36:39 bcoudoin>
+ * Time-stamp: <2003/10/07 00:05:10 bcoudoin>
  *
  * Copyright (C) 2000 Bruno Coudoin
  *
@@ -164,7 +164,7 @@ void gcompris_about_start ()
 
   gtk_signal_connect(GTK_OBJECT(item), "event",
 		     (GtkSignalFunc) item_event_ok,
-		     "ofset");
+		     "fsf");
   gtk_signal_connect(GTK_OBJECT(item), "event",
 		     (GtkSignalFunc) gcompris_item_event_focus,
 		     NULL);
@@ -403,7 +403,7 @@ item_event_ok(GnomeCanvasItem *item, GdkEvent *event, gpointer data)
 	{
 	  gnome_url_show("http://ofset.sourceforge.net", NULL);
 	}
-      else if (!strcmp((char *)data, "ofset"))
+      else if (!strcmp((char *)data, "fsf"))
 	{
 	  gnome_url_show("http://www.fsf.org", NULL);
 	}
@@ -418,7 +418,7 @@ item_event_ok(GnomeCanvasItem *item, GdkEvent *event, gpointer data)
 	   * Package relocatable.
 	   * Unfortunatly, this does not supports I18N
 	   */
-	  gnome_help_display(PACKAGE_HELP_DIR "/C/gcompris.html", NULL, NULL);
+	  gnome_url_show(PACKAGE_HELP_DIR "/C/gcompris.html", NULL);
 	}
     default:
       break;