From 99401f2abbf517b68c7f5999a42d0455f9b63aa9 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Tue, 17 May 2005 17:37:50 +0000 Subject: [PATCH] add a DATA_DIR in gajim --- src/common/gajim.py | 1 + src/config.py | 2 +- src/dialogs.py | 4 +++- src/gajim.py | 2 +- src/roster_window.py | 6 +++--- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/common/gajim.py b/src/common/gajim.py index a16c1824f..bf4faf4c4 100644 --- a/src/common/gajim.py +++ b/src/common/gajim.py @@ -26,3 +26,4 @@ config = common.config.Config() connections = {} log = logging.getLogger('Gajim') logger = common.logger.Logger() +DATA_DIR = '../data' diff --git a/src/config.py b/src/config.py index dc66821c2..a73e79ed3 100644 --- a/src/config.py +++ b/src/config.py @@ -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 = [] diff --git a/src/dialogs.py b/src/dialogs.py index 83bca5d70..8b9e57d7a 100644 --- a/src/dialogs.py +++ b/src/dialogs.py @@ -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 ', 'Vincent Hanquez ', 'Nikos Kouremenos ', 'Alex Podaras '] 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() diff --git a/src/gajim.py b/src/gajim.py index 2a556bacd..d9aad1061 100755 --- a/src/gajim.py +++ b/src/gajim.py @@ -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: diff --git a/src/roster_window.py b/src/roster_window.py index 74e1c7b9d..5cf87a590 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -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