[commit-gajim] r6394 - branches/gajim_0.10/src

Author: dkirov Date: 2006-05-31 20:18:56 +0200 (Wed, 31 May 2006) New Revision: 6394

Modified: branches/gajim_0.10/src/config.py Log: merge r6301

Modified: branches/gajim_0.10/src/config.py =================================================================== --- branches/gajim_0.10/src/config.py 2006-05-31 18:17:05 UTC (rev 6393) +++ branches/gajim_0.10/src/config.py 2006-05-31 18:18:56 UTC (rev 6394) @@ -2433,8 +2433,9 @@ self.pass_entry.set_text(password) else: self.pass_entry.set_text('') - nick = model[iter][5].decode('utf-8') + nick = model[iter][5] if nick: + nick = nick.decode('utf-8') self.nick_entry.set_text(nick) else: self.nick_entry.set_text('')