Commit 99401f2a authored by Yann Leboulanger's avatar Yann Leboulanger

add a DATA_DIR in gajim

parent fea1f2c4
......@@ -26,3 +26,4 @@ config = common.config.Config()
connections = {}
log = logging.getLogger('Gajim')
logger = common.logger.Logger()
DATA_DIR = '../data'
......@@ -107,7 +107,7 @@ class Preferences_window:
self.xml.get_widget('add_remove_emoticons_button').set_sensitive(st)
#iconset
iconsets_list = os.listdir('../data/iconsets/')
iconsets_list = os.listdir(os.path.join(gajim.DATA_DIR, 'iconsets/'))
model = gtk.ListStore(gobject.TYPE_STRING)
self.iconset_combobox.set_model(model)
l = []
......
......@@ -20,6 +20,7 @@
import gtk
import gtk.glade
import gobject
import os
from gajim import User
from common import gajim
from common import i18n
......@@ -375,7 +376,8 @@ class About_dialog:
authors = ['Yann Le Boulanger <asterix@lagaule.org>', 'Vincent Hanquez <tab@snarc.org>', 'Nikos Kouremenos <kourem@gmail.com>', 'Alex Podaras <bigpod@gmail.com>']
dlg.set_authors(authors)
dlg.set_logo(gtk.gdk.pixbuf_new_from_file('../data/pixmaps/logo.png'))
dlg.set_logo(gtk.gdk.pixbuf_new_from_file(os.path.join(gajim.DATA_DIR,
'pixmaps/logo.png')))
dlg.set_translator_credits(_('translator_credits'))
rep = dlg.run()
......
......@@ -718,7 +718,7 @@ class Interface:
#3:autoxa and use sleeper
iconset = gajim.config.get('iconset')
path = '../data/iconsets/' + iconset + '/'
path = os.path.join(gajim.DATA_DIR, 'iconsets/' + iconset + '/')
files = [path + 'online.gif', path + 'online.png', path + 'online.xpm']
pix = None
for fname in files:
......
......@@ -1207,7 +1207,7 @@ class Roster_window:
iconset = gajim.config.get('iconset')
if not iconset:
iconset = 'sun'
self.path = '../data/iconsets/' + iconset + '/'
self.path = os.path.join(gajim.DATA_DIR, 'iconsets/' + iconset + '/')
self.jabber_state_images = self.load_iconset(self.path)
def reload_jabber_state_images(self):
......@@ -1450,8 +1450,8 @@ class Roster_window:
self.make_jabber_state_images()
self.transports_state_images = { 'aim': {}, 'gadugadu': {}, 'icq': {}, 'msn': {}, 'yahoo': {} }
path = '../data/iconsets/transports'
folders = os.listdir('../data/iconsets/transports')
path = os.path.join(gajim.DATA_DIR, 'iconsets/transports')
folders = os.listdir(path)
for transport in folders:
if transport == '.svn':
continue
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment