Author: asterix Date: 2006-10-15 12:51:26 +0200 (Sun, 15 Oct 2006) New Revision: 7249

Modified: trunk/src/gajim.py Log: remove duplicate code

Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2006-10-15 10:32:17 UTC (rev 7248) +++ trunk/src/gajim.py 2006-10-15 10:51:26 UTC (rev 7249) @@ -1637,16 +1637,14 @@ return menu

def init_emoticons(self): - if not gajim.config.get('emoticons_theme'): + emot_theme = gajim.config.get('emoticons_theme') + if not emot_theme: return

#initialize emoticons dictionary and unique images list self.emoticons_images = list() self.emoticons = dict()

- emot_theme = gajim.config.get('emoticons_theme') - if not emot_theme: - return path = os.path.join(gajim.DATA_DIR, 'emoticons', emot_theme) if not os.path.exists(path): # It's maybe a user theme