correctly decode sting in manage bookmarks dialog. Fixes #4900
This commit is contained in:
parent
fc7ad2c766
commit
e058f2bdad
1 changed files with 17 additions and 5 deletions
|
@ -3237,13 +3237,25 @@ class ManageBookmarksWindow:
|
||||||
gajim.connections[account_unicode].bookmarks = []
|
gajim.connections[account_unicode].bookmarks = []
|
||||||
|
|
||||||
for bm in account.iterchildren():
|
for bm in account.iterchildren():
|
||||||
#Convert True/False/None to '1' or '0'
|
# Convert True/False/None to '1' or '0'
|
||||||
autojoin = unicode(int(bm[3]))
|
autojoin = unicode(int(bm[3]))
|
||||||
minimize = unicode(int(bm[4]))
|
minimize = unicode(int(bm[4]))
|
||||||
|
name = bm[1]
|
||||||
|
if name:
|
||||||
|
name = name.decode('utf-8')
|
||||||
|
jid = bm[2]
|
||||||
|
if jid:
|
||||||
|
jid = jid.decode('utf-8')
|
||||||
|
pw = bm[5]
|
||||||
|
if pw:
|
||||||
|
pw = pw.decode('utf-8')
|
||||||
|
nick = bm[6]
|
||||||
|
if nick:
|
||||||
|
nick = nick.decode('utf-8')
|
||||||
|
|
||||||
#create the bookmark-dict
|
# create the bookmark-dict
|
||||||
bmdict = { 'name': bm[1], 'jid': bm[2], 'autojoin': autojoin,
|
bmdict = { 'name': name, 'jid': jid, 'autojoin': autojoin,
|
||||||
'minimize': minimize, 'password': bm[5], 'nick': bm[6],
|
'minimize': minimize, 'password': pw, 'nick': nick,
|
||||||
'print_status': bm[7]}
|
'print_status': bm[7]}
|
||||||
|
|
||||||
gajim.connections[account_unicode].bookmarks.append(bmdict)
|
gajim.connections[account_unicode].bookmarks.append(bmdict)
|
||||||
|
|
Loading…
Add table
Reference in a new issue