changeset c140243c9c72 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=c140243c9c72 description: correctly decode sting in manage bookmarks dialog. Fixes #4900

diffstat:

src/config.py | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-)

diffs (36 lines):

diff -r 7055609c61dc -r c140243c9c72 src/config.py --- a/src/config.py Thu Jan 06 14:53:34 2011 +0100 +++ b/src/config.py Sat Mar 05 09:25:28 2011 +0100 @@ -3230,14 +3230,26 @@ gajim.connections[account_unicode].bookmarks = []

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])) minimize = unicode(int(bm[4])) - - #create the bookmark-dict - bmdict = { 'name': bm[1], 'jid': bm[2], 'autojoin': autojoin, - 'minimize': minimize, 'password': bm[5], 'nick': bm[6], - 'print_status': bm[7]} + 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 + bmdict = { 'name': name, 'jid': jid, 'autojoin': autojoin, + 'minimize': minimize, 'password': pw, 'nick': nick, + 'print_status': bm[7]}

gajim.connections[account_unicode].bookmarks.append(bmdict)