copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

ability to use adtadir environment variable to set data directory

Browse source
This commit is contained in:
Yann Leboulanger 2009-01-05 15:12:19 +00:00
parent ed3de38ce5
commit a4132ee58b
4 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/gajim-remote.in
View file

@ -24,7 +24,7 @@ if test $(id -u) -eq 0; then
exit 1 exit 1
fi fi
datadir=@DATADIR@ export datadir=@DATADIR@
PYTHON_EXEC=@PYTHON@ PYTHON_EXEC=@PYTHON@
cd ${datadir}/gajim/src cd ${datadir}/gajim/src

2
scripts/gajim.in
View file

@ -26,7 +26,7 @@ if test $(id -u) -eq 0; then
exit 1 exit 1
fi fi
datadir=@DATADIR@ export datadir=@DATADIR@
PYTHON_EXEC=@PYTHON@ PYTHON_EXEC=@PYTHON@
cd ${datadir}/gajim/src cd ${datadir}/gajim/src

7
src/common/configpaths.py
View file

@ -114,7 +114,12 @@ class ConfigPaths:
for n, p in zip(k, v): for n, p in zip(k, v):
self.add_from_root(n, p) 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('HOME', fse(os.path.expanduser('~')))
self.add('TMP', fse(tempfile.gettempdir())) self.add('TMP', fse(tempfile.gettempdir()))

8
src/roster_window.py
View file

@ -999,9 +999,9 @@ class RosterWindow:
if gajim.config.get('show_tunes_in_roster') \ if gajim.config.get('show_tunes_in_roster') \
and ('artist' in gajim.connections[account].tune \ and ('artist' in gajim.connections[account].tune \
or 'title' 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] = \ self.model[child_iter][C_TUNE_PIXBUF] = \
gtk.gdk.pixbuf_new_from_file( gtk.gdk.pixbuf_new_from_file(path)
'../data/emoticons/static/music.png')
else: else:
self.model[child_iter][C_TUNE_PIXBUF] = None self.model[child_iter][C_TUNE_PIXBUF] = None
@ -1262,8 +1262,8 @@ class RosterWindow:
jid = jid.decode('utf-8') jid = jid.decode('utf-8')
contact = gajim.contacts.get_contact(account, jid) contact = gajim.contacts.get_contact(account, jid)
if 'artist' in contact.tune or 'title' in contact.tune: if 'artist' in contact.tune or 'title' in contact.tune:
pixbuf = gtk.gdk.pixbuf_new_from_file( path = os.path.join(gajim.DATA_DIR, 'emoticons', 'static', 'music.png')
'../data/emoticons/static/music.png') pixbuf = gtk.gdk.pixbuf_new_from_file(path)
else: else:
pixbuf = None pixbuf = None
for child_iter in iters: for child_iter in iters: