[commit-gajim] r10934 - in trunk: scripts src src/common - Commits

5 Jan 2009

Author: asterix
Date: 2009-01-05 16:12:19 +0100 (Mon, 05 Jan 2009)
New Revision: 10934
Modified:
   trunk/scripts/gajim-remote.in
   trunk/scripts/gajim.in
   trunk/src/common/configpaths.py
   trunk/src/roster_window.py
Log:
ability to use adtadir environment variable to set data directory
Modified: trunk/scripts/gajim-remote.in
===================================================================

--- trunk/scripts/gajim-remote.in	2009-01-03 16:34:58 UTC (rev 10933)
+++ trunk/scripts/gajim-remote.in	2009-01-05 15:12:19 UTC (rev 10934)
@@ -24,7 +24,7 @@
    exit 1
 fi
-datadir=@DATADIR@
+export datadir=@DATADIR@
 PYTHON_EXEC=@PYTHON@
cd ${datadir}/gajim/src
Modified: trunk/scripts/gajim.in
===================================================================
--- trunk/scripts/gajim.in	2009-01-03 16:34:58 UTC (rev 10933)
+++ trunk/scripts/gajim.in	2009-01-05 15:12:19 UTC (rev 10934)
@@ -26,7 +26,7 @@
    exit 1
 fi
-datadir=@DATADIR@
+export datadir=@DATADIR@
 PYTHON_EXEC=@PYTHON@
cd ${datadir}/gajim/src
Modified: trunk/src/common/configpaths.py
===================================================================
--- trunk/src/common/configpaths.py	2009-01-03 16:34:58 UTC (rev 10933)
+++ trunk/src/common/configpaths.py	2009-01-05 15:12:19 UTC (rev 10934)
@@ -114,7 +114,12 @@
    	for n, p in zip(k, v):
    		self.add_from_root(n, p)
-		self.add('DATA', os.path.join(u'..', windowsify(u'data')))
+		datadir = ''
+		if u'datadir' in os.environ:
+			datadir = fse(os.environ[u'datadir'])
+		if not datadir:
+			datadir = u'..'
+		self.add('DATA', os.path.join(datadir, windowsify(u'data')))
    	self.add('HOME', fse(os.path.expanduser('~')))
    	self.add('TMP', fse(tempfile.gettempdir()))
Modified: trunk/src/roster_window.py
===================================================================
--- trunk/src/roster_window.py	2009-01-03 16:34:58 UTC (rev 10933)
+++ trunk/src/roster_window.py	2009-01-05 15:12:19 UTC (rev 10934)
@@ -999,9 +999,9 @@
    	if gajim.config.get('show_tunes_in_roster') \
    	and ('artist' in gajim.connections[account].tune \
    	or 'title' in gajim.connections[account].tune):
+			path = os.path.join(gajim.DATA_DIR, 'emoticons', 'static', 'music.png')
    		self.model[child_iter][C_TUNE_PIXBUF] = \
-				gtk.gdk.pixbuf_new_from_file(
-				'../data/emoticons/static/music.png')
+				gtk.gdk.pixbuf_new_from_file(path)
    	else:
    		self.model[child_iter][C_TUNE_PIXBUF] = None
@@ -1262,8 +1262,8 @@
    	jid = jid.decode('utf-8')
    	contact = gajim.contacts.get_contact(account, jid)
    	if 'artist' in contact.tune or 'title' in contact.tune:
-			pixbuf = gtk.gdk.pixbuf_new_from_file(
-				'../data/emoticons/static/music.png')
+			path = os.path.join(gajim.DATA_DIR, 'emoticons', 'static', 'music.png')
+			pixbuf = gtk.gdk.pixbuf_new_from_file(path)
    	else:
    		pixbuf = None
    	for child_iter in iters:

    