Commit cd20e874 authored by dkirov's avatar dkirov
Browse files

complete merge (deleting files and recent

				updates)
parent 5fc8cf20
......@@ -275,10 +275,7 @@ def set_img(self):
def load_icos(self):
'''load .ico files and return them to a dic of SHOW --> img_obj'''
iconset = str(gajim.config.get('iconset'))
if not iconset:
iconset = 'dcraven'
iconset = gajim.config.get('iconset')
imgs = {}
path = os.path.join(gajim.DATA_DIR, 'iconsets', iconset, '16x16', 'icos')
# icon folder for missing icons
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment