gcompris r3340 - in branches/gcomprixogoo/src: . gcompris

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Sun Mar 23 16:02:31 2008
New Revision: 3340
URL: http://svn.gnome.org/viewvc/gcompris?rev=3340&view=rev

Log:
Fixed skin references


Modified:
   branches/gcomprixogoo/src/Makefile.am
   branches/gcomprixogoo/src/gcompris/config.c
   branches/gcomprixogoo/src/gcompris/skin.c

Modified: branches/gcomprixogoo/src/Makefile.am
==============================================================================
--- branches/gcomprixogoo/src/Makefile.am	(original)
+++ branches/gcomprixogoo/src/Makefile.am	Sun Mar 23 16:02:31 2008
@@ -110,3 +110,5 @@
 	sudoku-activity \
 	tuxpaint-activity \
 	watercycle-activity
+
+EXTRA_DIST = runit.sh

Modified: branches/gcomprixogoo/src/gcompris/config.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/config.c	(original)
+++ branches/gcomprixogoo/src/gcompris/config.c	Sun Mar 23 16:02:31 2008
@@ -374,7 +374,7 @@
       if (one_dirent[0] != '.') {
 	gchar *filename;
 	/* Only directory here are skins */
-	filename = g_strdup_printf("%s/skins/%s", properties->package_data_dir, one_dirent);
+	filename = g_strdup_printf("%s/%s", properties->package_skin_dir, one_dirent);
 
 	if (g_file_test ((filename), G_FILE_TEST_IS_DIR)) {
 	  gchar *skin_name = g_strdup_printf("%s", one_dirent);

Modified: branches/gcomprixogoo/src/gcompris/skin.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/skin.c	(original)
+++ branches/gcomprixogoo/src/gcompris/skin.c	Sun Mar 23 16:02:31 2008
@@ -70,7 +70,7 @@
   if (g_file_test ((filename), G_FILE_TEST_EXISTS)) {
     g_free(filename);
 
-    filename = g_strdup_printf("skins/%s/%s", properties->skin, pixmapfile);
+    filename = g_strdup_printf("%s/%s", properties->skin, pixmapfile);
 
     return(filename);
   }
@@ -82,7 +82,7 @@
     return(filename);
 
   /* Return the default skin dir */
-  filename = g_strdup_printf("skins/%s/%s", DEFAULT_SKIN, pixmapfile);
+  filename = g_strdup_printf("%s/%s", DEFAULT_SKIN, pixmapfile);
   return(filename);
 }