copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

plugin system. checking the type of stored data. Fix #7220

Browse source
This commit is contained in:
Denis Fomin 2012-08-22 22:21:26 +04:00
parent dce12f3f98
commit bb5db97546
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/plugins/plugin.py
View file

@ -259,6 +259,8 @@ class GajimPluginConfig():
s = shelve.open(self.FILE_PATH) s = shelve.open(self.FILE_PATH)
for (k, v) in s.iteritems(): for (k, v) in s.iteritems():
self.data[k] = v self.data[k] = v
if not isinstance(self.data, dict):
raise GajimPluginException
s.close() s.close()
self.save() self.save()
except: except:

6
src/roster_window.py
View file

@ -1192,10 +1192,10 @@ class RosterWindow:
# add status msg, if not empty, under contact name in # add status msg, if not empty, under contact name in
# the treeview # the treeview
if not contact.status:
contact.status = ' '
if contact.status and gajim.config.get('show_status_msgs_in_roster'): if contact.status and gajim.config.get('show_status_msgs_in_roster'):
status = contact.status.strip() status = helpers.reduce_chars_newlines(contact.status,
if status != '':
status = helpers.reduce_chars_newlines(status,
max_lines = 1) max_lines = 1)
# escape markup entities and make them small # escape markup entities and make them small
# italic and fg color color is calcuted to be # italic and fg color color is calcuted to be