From e8b0090e9e593f1d64ee31d76e1d5f3557cee405 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Wed, 10 Jun 2009 11:44:58 +0200
Subject: [PATCH] set iconset to DEFAULT_ICONSET when configured one doesn't
exist. Fixes #5083
---
src/gtkgui_helpers.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/gtkgui_helpers.py b/src/gtkgui_helpers.py
index 3983b6aba2..78de6a79d2 100644
--- a/src/gtkgui_helpers.py
+++ b/src/gtkgui_helpers.py
@@ -962,11 +962,17 @@ def make_jabber_state_images():
'''initialise jabber_state_images dict'''
iconset = gajim.config.get('iconset')
if iconset:
- path = os.path.join(helpers.get_iconset_path(iconset), '16x16')
- if not os.path.exists(path):
+ if helpers.get_iconset_path(iconset):
+ path = os.path.join(helpers.get_iconset_path(iconset), '16x16')
+ if not os.path.exists(path):
+ iconset = gajim.config.DEFAULT_ICONSET
+ gajim.config.set('iconset', iconset)
+ else:
iconset = gajim.config.DEFAULT_ICONSET
+ gajim.config.set('iconset', iconset)
else:
iconset = gajim.config.DEFAULT_ICONSET
+ gajim.config.set('iconset', iconset)
path = os.path.join(helpers.get_iconset_path(iconset), '32x32')
gajim.interface.jabber_state_images['32'] = load_iconset(path)
--
GitLab