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

there are problems with IDNA, so I remove it for the moment

This commit is contained in:
Yann Leboulanger 2005-10-20 08:48:19 +00:00
parent f24c2db136
commit 8060b8b515
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/config.py
View File

@ -1106,7 +1106,7 @@ class AccountModificationWindow:
self.xml.get_widget('name_entry').set_text(self.account) self.xml.get_widget('name_entry').set_text(self.account)
jid = gajim.config.get_per('accounts', self.account, 'name') \ jid = gajim.config.get_per('accounts', self.account, 'name') \
+ '@' + gajim.config.get_per('accounts', + '@' + gajim.config.get_per('accounts',
self.account, 'hostname').decode('idna') self.account, 'hostname')
self.xml.get_widget('jid_entry').set_text(jid) self.xml.get_widget('jid_entry').set_text(jid)
self.xml.get_widget('save_password_checkbutton').set_active( self.xml.get_widget('save_password_checkbutton').set_active(
gajim.config.get_per('accounts', self.account, 'savepass')) gajim.config.get_per('accounts', self.account, 'savepass'))
@ -1134,10 +1134,10 @@ class AccountModificationWindow:
self.xml.get_widget('custom_host_port_checkbutton').set_active( self.xml.get_widget('custom_host_port_checkbutton').set_active(
use_custom_host) use_custom_host)
custom_host = gajim.config.get_per('accounts', self.account, custom_host = gajim.config.get_per('accounts', self.account,
'custom_host').decode('idna') 'custom_host')
if not custom_host: if not custom_host:
custom_host = gajim.config.get_per('accounts', custom_host = gajim.config.get_per('accounts',
self.account, 'hostname').decode('idna') self.account, 'hostname')
self.xml.get_widget('custom_host_entry').set_text(custom_host) self.xml.get_widget('custom_host_entry').set_text(custom_host)
custom_port = gajim.config.get_per('accounts', self.account, custom_port = gajim.config.get_per('accounts', self.account,
'custom_port') 'custom_port')
@ -1231,7 +1231,7 @@ _('To change the account name, you must be disconnected.')).get_response()
config['usessl'] = self.xml.get_widget('use_ssl_checkbutton').get_active() config['usessl'] = self.xml.get_widget('use_ssl_checkbutton').get_active()
n, hn = jid.split('@') n, hn = jid.split('@')
config['name'] = n config['name'] = n
config['hostname'] = hn.encode('idna') config['hostname'] = hn
config['use_custom_host'] = self.xml.get_widget( config['use_custom_host'] = self.xml.get_widget(
'custom_host_port_checkbutton').get_active() 'custom_host_port_checkbutton').get_active()
@ -1244,7 +1244,7 @@ _('To change the account name, you must be disconnected.')).get_response()
return return
config['custom_port'] = custom_port config['custom_port'] = custom_port
config['custom_host'] = self.xml.get_widget( config['custom_host'] = self.xml.get_widget(
'custom_host_entry').get_text().decode('utf-8').encode('idna') 'custom_host_entry').get_text().decode('utf-8')
config['keyname'] = self.xml.get_widget('gpg_name_label').get_text().decode('utf-8') config['keyname'] = self.xml.get_widget('gpg_name_label').get_text().decode('utf-8')
if config['keyname'] == '': #no key selected if config['keyname'] == '': #no key selected