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

don't try to escape JID when we get a subscription request from it, it's already escaped. Fixes #7277

This commit is contained in:
Yann Leboulanger 2013-01-22 17:38:43 +01:00
parent 63c854f6f7
commit 980492e33b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dialogs.py
View File

@ -947,6 +947,7 @@ class AddNewContactWindow:
liststore = gtk.ListStore(str) liststore = gtk.ListStore(str)
self.protocol_jid_combobox.set_model(liststore) self.protocol_jid_combobox.set_model(liststore)
if jid: if jid:
self.jid_escaped = True
type_ = gajim.get_transport_name_from_jid(jid) type_ = gajim.get_transport_name_from_jid(jid)
if not type_: if not type_:
type_ = 'jabber' type_ = 'jabber'
@ -981,6 +982,7 @@ class AddNewContactWindow:
self.nickname_entry.set_text(user_nick) self.nickname_entry.set_text(user_nick)
self.nickname_entry.grab_focus() self.nickname_entry.grab_focus()
else: else:
self.jid_escaped = False
self.uid_entry.grab_focus() self.uid_entry.grab_focus()
group_names = [] group_names = []
for acct in accounts: for acct in accounts:
@ -1055,7 +1057,7 @@ class AddNewContactWindow:
model = self.protocol_combobox.get_model() model = self.protocol_combobox.get_model()
iter_ = self.protocol_combobox.get_active_iter() iter_ = self.protocol_combobox.get_active_iter()
type_ = model[iter_][2] type_ = model[iter_][2]
if type_ != 'jabber': if type_ != 'jabber' and not self.jid_escaped:
transport = self.protocol_jid_combobox.get_active_text().decode( transport = self.protocol_jid_combobox.get_active_text().decode(
'utf-8') 'utf-8')
if self.account: if self.account: