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

[elghinn/jim]Correctly reload emoticons set :). Fixes #2445

This commit is contained in:
Jean-Marie Traissard 2006-11-06 05:37:29 +00:00
parent dcbde70325
commit e8d2bfe1ce
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.py
View File

@ -577,7 +577,7 @@ class PreferencesWindow:
else: else:
gajim.config.set('emoticons_theme', emot_theme) gajim.config.set('emoticons_theme', emot_theme)
gajim.interface.init_emoticons() gajim.interface.init_emoticons(need_reload = True)
gajim.interface.make_regexps() gajim.interface.make_regexps()
self.toggle_emoticons() self.toggle_emoticons()

12
src/gajim.py
View File

@ -1652,12 +1652,12 @@ class Interface:
menu.show_all() menu.show_all()
return menu return menu
def init_emoticons(self): def init_emoticons(self, need_reload = False):
emot_theme = gajim.config.get('emoticons_theme') emot_theme = gajim.config.get('emoticons_theme')
if not emot_theme: if not emot_theme:
return return
# initialize emoticons dictionary and unique images list #initialize emoticons dictionary and unique images list
self.emoticons_images = list() self.emoticons_images = list()
self.emoticons = dict() self.emoticons = dict()
@ -1668,7 +1668,11 @@ class Interface:
if not os.path.exists(path): # theme doesn't exist if not os.path.exists(path): # theme doesn't exist
return return
sys.path.append(path) sys.path.append(path)
from emoticons import emoticons as emots import emoticons
if need_reload:
# we need to reload else that doesn't work when changing emoticon set
reload(emoticons)
emots = emoticons.emoticons
for emot in emots: for emot in emots:
emot_file = os.path.join(path, emots[emot]) emot_file = os.path.join(path, emots[emot])
if not self.image_is_ok(emot_file): if not self.image_is_ok(emot_file):
@ -1682,7 +1686,7 @@ class Interface:
self.emoticons_images.append((emot, pix)) self.emoticons_images.append((emot, pix))
self.emoticons[emot.upper()] = emot_file self.emoticons[emot.upper()] = emot_file
sys.path.remove(path) sys.path.remove(path)
del emots del emoticons
if self.emoticons_menu: if self.emoticons_menu:
self.emoticons_menu.destroy() self.emoticons_menu.destroy()
self.emoticons_menu = self.prepare_emoticons_menu() self.emoticons_menu = self.prepare_emoticons_menu()