use one global variable in one place

This commit is contained in:
Nikos Kouremenos 2006-09-25 09:44:19 +00:00
parent 229d9cac50
commit cbbb8c1faa
1 changed files with 2 additions and 5 deletions

View File

@ -55,9 +55,6 @@ C_EDITABLE, # cellrenderer text that holds name editable or not?
C_SECPIXBUF, # secondary_pixbuf (holds avatar or padlock) C_SECPIXBUF, # secondary_pixbuf (holds avatar or padlock)
) = range(7) ) = range(7)
DEFAULT_ICONSET = 'dcraven'
class RosterWindow: class RosterWindow:
'''Class for main window of gtkgui interface''' '''Class for main window of gtkgui interface'''
@ -3134,9 +3131,9 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
if iconset: if iconset:
path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16') path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16')
if not os.path.exists(path): if not os.path.exists(path):
iconset = DEFAULT_ICONSET iconset = gajim.config.DEFAULT_ICONSET
else: else:
iconset = DEFAULT_ICONSET iconset = gajim.config.DEFAULT_ICONSET
path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '32x32') path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '32x32')
self.jabber_state_images['32'] = self.load_iconset(path) self.jabber_state_images['32'] = self.load_iconset(path)