From 4b4e99f99d257f279e02b87d4f41df66c2516c28 Mon Sep 17 00:00:00 2001
From: Simon Schampijer <simon@schampijer.de>
Date: Sat, 28 Jul 2007 10:10:04 +0000
Subject: Removed absolute path of images and sounds

Removed absolute path for game icons and sounds
which was cauing problems when a game is shared between
an XO and a sugar-jhbuild emulator
---
diff --git a/NEWS b/NEWS
index cd34b45..1948559 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+* Removed absolute path for game icons and sounds
+which was cauing problems when a game is shared between
+an XO and a sugar-jhbuild emulator (erikos)
+
 * Free the audio device when not in focus (erikos)
 
 * Memorize now uses the ogg vorbis format to play sounds 
diff --git a/cardtable.py b/cardtable.py
index 11bf1b5..e61b6f0 100755
--- a/cardtable.py
+++ b/cardtable.py
@@ -78,7 +78,7 @@ class CardTable(gtk.EventBox):
         
         for card in self.cards_data:        
             if card.get('img', None):
-                jpg = card['img']
+                jpg = os.path.join(os.path.dirname(__file__), card['img'])
             else:
                 jpg = None
             props = {}
diff --git a/game.py b/game.py
index 30fdae7..cc91891 100755
--- a/game.py
+++ b/game.py
@@ -147,7 +147,7 @@ class MemorizeGame(gobject.GObject):
         if self.sound == 1:
             snd = self.model.grid[id].get('snd', None)
             if snd != None:
-                self.cs.perform('i 108 0.0 3.0 "%s" 1 0.9 0'%(snd))                
+                self.cs.perform('i 108 0.0 3.0 "%s" 1 0.9 0'%(os.path.join(os.path.dirname(__file__), snd)))                
                 _logger.debug('Audio: play sound=%s'%snd)
                 
         # First card case
diff --git a/model.py b/model.py
index f829ab4..224daa6 100644
--- a/model.py
+++ b/model.py
@@ -86,7 +86,7 @@ class Model(object):
         self.data = {}
         self.dtdpath = dtdpath
         if gamespath == None:
-            self._GAMES_PATH = os.path.join(os.path.dirname(__file__), 'games')
+            self._GAMES_PATH = 'games' 
         else:
             if os.path.isdir(gamespath) is False:
                 os.makedirs(gamespath)
@@ -121,7 +121,7 @@ class Model(object):
         self.pairs = {}
 
         try:
-            doc = libxml2.parseFile(os.path.join(self.data['path'], gamename+'.mem'))            
+            doc = libxml2.parseFile(os.path.join(os.path.dirname(__file__), os.path.join(self.data['path'], gamename+'.mem')))
             if doc.validateDtd(self.ctxt, self.dtd):
         
                 # get the requested nodes
@@ -254,8 +254,8 @@ class Model(object):
                 if self.pairs[key].props.aimg != None:
                     elem['img'] = os.path.join(self.data['pathimg'], self.pairs[key].props.aimg)
                 if self.pairs[key].props.asnd != None:
-                    if os.path.isfile(os.path.join(self.data['pathsnd'], self.pairs[key].props.asnd)):
-                        elem['snd'] = os.path.join(self.data['pathsnd'], self.pairs[key].props.asnd)
+                    #if os.path.isfile(os.path.join(self.data['pathsnd'], self.pairs[key].props.asnd)):
+                    elem['snd'] = os.path.join(self.data['pathsnd'], self.pairs[key].props.asnd)
                 if self.pairs[key].props.achar != None:
                     elem['char'] = self.pairs[key].props.achar
                 temp1.append(elem)
@@ -267,8 +267,8 @@ class Model(object):
                 if self.pairs[key].props.bimg != None:
                     elem['img'] = os.path.join(self.data['pathimg'], self.pairs[key].props.bimg)
                 if self.pairs[key].props.bsnd != None:
-                    if os.path.isfile(os.path.join(self.data['pathsnd'], self.pairs[key].props.bsnd)):
-                        elem['snd'] = os.path.join(self.data['pathsnd'], self.pairs[key].props.bsnd)
+                    #if os.path.isfile(os.path.join(self.data['pathsnd'], self.pairs[key].props.bsnd)):
+                    elem['snd'] = os.path.join(self.data['pathsnd'], self.pairs[key].props.bsnd)
                 if self.pairs[key].props.bchar != None:
                     elem['char'] = self.pairs[key].props.bchar
                 temp2.append(elem)    
--
cgit v0.9.1