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

View my_emoticones sets in prefs (regression in [7355])

This commit is contained in:
Jean-Marie Traissard 2006-11-06 00:06:35 +00:00
parent 291666a5e3
commit dcbde70325
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/config.py
View File

@ -122,7 +122,8 @@ class PreferencesWindow:
emoticons_combobox.set_model(model)
l = []
for dir in emoticons_list:
if not os.path.isdir(os.path.join(gajim.DATA_DIR, 'emoticons', dir)):
if not os.path.isdir(os.path.join(gajim.DATA_DIR, 'emoticons', dir)) \
and not os.path.isdir(os.path.join(gajim.MY_EMOTS_PATH, dir)) :
continue
if dir != '.svn':
l.append(dir)

2
src/gajim.py
View File

@ -1657,7 +1657,7 @@ class Interface:
if not emot_theme:
return
#initialize emoticons dictionary and unique images list
# initialize emoticons dictionary and unique images list
self.emoticons_images = list()
self.emoticons = dict()