gcompris r3368 - branches/gcomprixogoo/src/gcompris

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Sun Apr 13 20:14:27 2008
New Revision: 3368
URL: http://svn.gnome.org/viewvc/gcompris?rev=3368&view=rev

Log:
fixed skin.xml path. skin system works again.


Modified:
   branches/gcomprixogoo/src/gcompris/skin.c

Modified: branches/gcomprixogoo/src/gcompris/skin.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/skin.c	(original)
+++ branches/gcomprixogoo/src/gcompris/skin.c	Sun Apr 13 20:14:27 2008
@@ -63,7 +63,7 @@
 
   /* First, test if pixmapfile is in the current skin dir */
   filename = g_strdup_printf("%s/%s/%s",
-			     properties->package_data_dir,
+			     properties->package_skin_dir,
 			     properties->skin,
 			     pixmapfile);
 
@@ -76,11 +76,6 @@
   }
   g_free(filename);
 
-  /* Check it's on the server */
-  filename = gc_net_get_url_from_file("boards/skins/%s/%s", properties->skin, pixmapfile);
-  if(filename)
-    return(filename);
-
   /* Return the default skin dir */
   filename = g_strdup_printf("%s/%s", DEFAULT_SKIN, pixmapfile);
   return(filename);
@@ -280,9 +275,9 @@
   g_return_if_fail(skin!=NULL);
 
   xmlfilename = \
-    gc_file_find_absolute("skins/%s/skin.xml",
-				    skin,
-				    NULL);
+    gc_file_find_absolute("%s/skin.xml",
+			  skin,
+			  NULL);
 
   /* if the file doesn't exist */
   if(!xmlfilename)