failsafe to dcraven
This commit is contained in:
parent
f7ee0dffd9
commit
19a64469f4
|
@ -1119,7 +1119,7 @@ class RosterWindow:
|
||||||
# using self.jabber_status_images is poopoo
|
# using self.jabber_status_images is poopoo
|
||||||
iconset = gajim.config.get('iconset')
|
iconset = gajim.config.get('iconset')
|
||||||
if not iconset:
|
if not iconset:
|
||||||
iconset = 'sun'
|
iconset = 'dcraven'
|
||||||
path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16')
|
path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16')
|
||||||
state_images = self.load_iconset(path)
|
state_images = self.load_iconset(path)
|
||||||
|
|
||||||
|
@ -1201,7 +1201,7 @@ class RosterWindow:
|
||||||
menu = gtk.Menu()
|
menu = gtk.Menu()
|
||||||
iconset = gajim.config.get('iconset')
|
iconset = gajim.config.get('iconset')
|
||||||
if not iconset:
|
if not iconset:
|
||||||
iconset = 'sun'
|
iconset = 'dcraven'
|
||||||
path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16')
|
path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16')
|
||||||
for account in gajim.connections:
|
for account in gajim.connections:
|
||||||
state_images = self.load_iconset(path)
|
state_images = self.load_iconset(path)
|
||||||
|
@ -2173,7 +2173,7 @@ _('If "%s" accepts this request you will know his or her status.') %jid)
|
||||||
'''initialise jabber_state_images dict'''
|
'''initialise jabber_state_images dict'''
|
||||||
iconset = gajim.config.get('iconset')
|
iconset = gajim.config.get('iconset')
|
||||||
if not iconset:
|
if not iconset:
|
||||||
iconset = 'sun'
|
iconset = 'dcraven'
|
||||||
path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '32x32')
|
path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '32x32')
|
||||||
if os.path.exists(path):
|
if os.path.exists(path):
|
||||||
self.jabber_state_images['32'] = self.load_iconset(path)
|
self.jabber_state_images['32'] = self.load_iconset(path)
|
||||||
|
|
|
@ -234,7 +234,7 @@ class Systray:
|
||||||
def make_groups_submenus_for_chat_with(self, account):
|
def make_groups_submenus_for_chat_with(self, account):
|
||||||
iconset = gajim.config.get('iconset')
|
iconset = gajim.config.get('iconset')
|
||||||
if not iconset:
|
if not iconset:
|
||||||
iconset = 'sun'
|
iconset = 'dcraven'
|
||||||
path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16')
|
path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16')
|
||||||
state_images = gajim.interface.roster.load_iconset(path)
|
state_images = gajim.interface.roster.load_iconset(path)
|
||||||
|
|
||||||
|
|
|
@ -319,7 +319,7 @@ class SystrayWin32(systray.Systray):
|
||||||
'''load .ico files and return them to a dic of SHOW --> img_obj'''
|
'''load .ico files and return them to a dic of SHOW --> img_obj'''
|
||||||
iconset = str(gajim.config.get('iconset'))
|
iconset = str(gajim.config.get('iconset'))
|
||||||
if not iconset:
|
if not iconset:
|
||||||
iconset = 'sun'
|
iconset = 'dcraven'
|
||||||
|
|
||||||
imgs = {}
|
imgs = {}
|
||||||
path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16', 'icos')
|
path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16', 'icos')
|
||||||
|
|
|
@ -210,7 +210,7 @@ class NotificationAreaTooltip(BaseTooltip, StatusTable):
|
||||||
def fill_table_with_accounts(self, accounts):
|
def fill_table_with_accounts(self, accounts):
|
||||||
iconset = gajim.config.get('iconset')
|
iconset = gajim.config.get('iconset')
|
||||||
if not iconset:
|
if not iconset:
|
||||||
iconset = 'sun'
|
iconset = 'dcraven'
|
||||||
file_path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16')
|
file_path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16')
|
||||||
for acct in accounts:
|
for acct in accounts:
|
||||||
message = acct['message']
|
message = acct['message']
|
||||||
|
@ -390,7 +390,7 @@ class RosterTooltip(NotificationAreaTooltip):
|
||||||
else:
|
else:
|
||||||
iconset = gajim.config.get('iconset')
|
iconset = gajim.config.get('iconset')
|
||||||
if not iconset:
|
if not iconset:
|
||||||
iconset = 'sun'
|
iconset = 'dcraven'
|
||||||
file_path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16')
|
file_path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16')
|
||||||
|
|
||||||
files = []
|
files = []
|
||||||
|
|
Loading…
Reference in New Issue