plugin system. checking the type of stored data. Fix #7220
This commit is contained in:
parent
dce12f3f98
commit
bb5db97546
2 changed files with 5 additions and 3 deletions
|
@ -259,6 +259,8 @@ class GajimPluginConfig():
|
|||
s = shelve.open(self.FILE_PATH)
|
||||
for (k, v) in s.iteritems():
|
||||
self.data[k] = v
|
||||
if not isinstance(self.data, dict):
|
||||
raise GajimPluginException
|
||||
s.close()
|
||||
self.save()
|
||||
except:
|
||||
|
|
|
@ -1192,10 +1192,10 @@ class RosterWindow:
|
|||
|
||||
# add status msg, if not empty, under contact name in
|
||||
# the treeview
|
||||
if not contact.status:
|
||||
contact.status = ' '
|
||||
if contact.status and gajim.config.get('show_status_msgs_in_roster'):
|
||||
status = contact.status.strip()
|
||||
if status != '':
|
||||
status = helpers.reduce_chars_newlines(status,
|
||||
status = helpers.reduce_chars_newlines(contact.status,
|
||||
max_lines = 1)
|
||||
# escape markup entities and make them small
|
||||
# italic and fg color color is calcuted to be
|
||||
|
|
Loading…
Add table
Reference in a new issue