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

[blarz] Check is ~/.gajim/iconsets/transports exists before using it. See #3390 and [8555].

This commit is contained in:
Julien Pivotto 2007-08-22 23:40:44 +00:00
parent 2419bd509c
commit 96446f2a9f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/roster_window.py
View File

@ -4439,6 +4439,7 @@ class RosterWindow:
# standard transport iconsets are loaded one time in init() # standard transport iconsets are loaded one time in init()
t_path = os.path.join(gajim.DATA_DIR, 'iconsets', 'transports') t_path = os.path.join(gajim.DATA_DIR, 'iconsets', 'transports')
folders = os.listdir(t_path) folders = os.listdir(t_path)
if os.path.isdir(os.path.join(gajim.MY_ICONSETS_PATH, 'transports')):
t_path = os.path.join(gajim.MY_ICONSETS_PATH, 'transports') t_path = os.path.join(gajim.MY_ICONSETS_PATH, 'transports')
folders += os.listdir(t_path) folders += os.listdir(t_path)
for transport in folders: for transport in folders:
@ -5149,6 +5150,7 @@ class RosterWindow:
path = os.path.join(gajim.DATA_DIR, 'iconsets', 'transports') path = os.path.join(gajim.DATA_DIR, 'iconsets', 'transports')
folders = os.listdir(path) folders = os.listdir(path)
if os.path.isdir(os.path.join(gajim.MY_ICONSETS_PATH, 'transports')):
path = os.path.join(gajim.MY_ICONSETS_PATH, 'transports') path = os.path.join(gajim.MY_ICONSETS_PATH, 'transports')
folders += os.listdir(path) folders += os.listdir(path)
for transport in folders: for transport in folders: