Commit 23410a9d authored by Bruno Coudoin's avatar Bruno Coudoin

added a tux image set with our tux images commented out svg export code

	* boards/dataset/misc.xml: added a tux image set with our tux images
	* src/boards/python/anim.py: commented out svg export code
	* src/gcompris/file_selector.c: (item_event_file_selector),
	(parseMime): fixed segfault on mime type
	* src/gcompris/images_selector.c: (read_dataset_directory): minor, now allow simlynks
parent 428eff12
2006-09-30 Bruno coudoin <bruno.coudoin@free.fr>
* boards/dataset/misc.xml: added a tux image set with our tux images
* src/boards/python/anim.py: commented out svg export code
* src/gcompris/file_selector.c: (item_event_file_selector),
(parseMime): fixed segfault on mime type
* src/gcompris/images_selector.c: (read_dataset_directory): minor, now allow simlynks
2006-09-25 Bruno coudoin <bruno.coudoin@free.fr>
- fixed missing config.h.mingw.in (that replaces config.h.mingw)
......
......@@ -39,6 +39,8 @@
<Image filename="railroad/loco4.png"/>
<Image filename="railroad/wagon13.png"/>
<Image filename="railroad/wagon6.png"/>
<Image filename="images/wagon-green.png"/>
<Image filename="images/wagon-yellow.png"/>
<Image filename="chronos/images/helico_cornu.png"/>
<Image filename="chronos/images/wright_flyer.png"/>
<Image filename="chronos/images/lindbergh.png"/>
......@@ -90,6 +92,8 @@
<Image filename="gcompris/misc/tree.png"/>
<Image filename="imageid/chien.png"/>
<Image filename="imageid/fish.png"/>
<Image filename="images/water_spot.png"/>
<Image filename="images/water_drop.png"/>
</ImageSet>
<ImageSet filename="gcompris/food/grapefruit.png">
<Image filename="gcompris/misc/apple.png"/>
......@@ -118,4 +122,20 @@
<Image filename="gcompris/food/suggar_box.png"/>
<Image filename="gcompris/food/yahourt.png"/>
</ImageSet>
<ImageSet filename="gcompris/misc/tux.png">
<Image filename="gcompris/misc/tuxboat.png"/>
<Image filename="gcompris/misc/sailingboat.png"/>
<Image filename="gcompris/misc/tuxhelico.png"/>
<Image filename="gcompris/misc/tuxballoon.png"/>
<Image filename="gcompris/misc/tuxloco.png"/>
<Image filename="gcompris/misc/tuxplane.png"/>
<Image filename="gcompris/misc/Tux_mute.png"/>
<Image filename="gcompris/misc/Tux_play.png"/>
<Image filename="gcompris/misc/tux_top_north.png"/>
<Image filename="gcompris/misc/tux_top_south.png"/>
<Image filename="images/tux_albert.png"/>
<Image filename="images/tux_graduate.png"/>
<Image filename="images/tux-teacher.png"/>
<Image filename="images/tux_teen.png"/>
</ImageSet>
</ImageSetRoot>
This diff is collapsed.
......@@ -735,11 +735,14 @@ item_event_file_selector(GnomeCanvasItem *item, GdkEvent *event, gpointer data)
/* Extract the mime type */
mimeType = (GcomprisMimeType *)(g_hash_table_lookup(mimetypes_desc_hash, file_type));
file_type = strdup(mimeType->mimetype);
if(!g_str_has_suffix(result,mimeType->extension)) {
gchar *old_result = result;
result = g_strconcat(result, mimeType->extension, NULL);
g_free(old_result);
g_free(file_type);
if(mimeType && mimeType->mimetype) {
file_type = strdup(mimeType->mimetype);
if(!g_str_has_suffix(result,mimeType->extension)) {
gchar *old_result = result;
result = g_strconcat(result, mimeType->extension, NULL);
g_free(old_result);
}
}
} else {
/* LOAD Mode, get the file_type from the extension in the mimetype */
......@@ -833,7 +836,7 @@ void parseMime (xmlDocPtr doc, xmlNodePtr xmlnode) {
g_hash_table_insert(mimetypes_hash, gcomprisMime->mimetype, gcomprisMime);
g_hash_table_insert(mimetypes_ext_hash, gcomprisMime->extension, gcomprisMime);
g_hash_table_insert(mimetypes_desc_hash, gcomprisMime->description, gcomprisMime);
g_hash_table_insert(mimetypes_desc_hash, gettext(gcomprisMime->description), gcomprisMime);
return;
}
......
......@@ -867,7 +867,7 @@ read_dataset_directory(gchar *dataset_dir)
absolute_fname = g_strdup_printf("%s/%s", dataset_dir, fname);
g_warning("Reading dataset file %s", absolute_fname);
if (!g_file_test ((absolute_fname), G_FILE_TEST_IS_REGULAR))
if (!g_file_test ((absolute_fname), G_FILE_TEST_EXISTS))
continue;
/* parse the new file and put the result into newdoc */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment