From 38df4d2c1f65ea6b6e78f8c0d7c311ad1ff967b5 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Tue, 22 Jan 2013 17:38:43 +0100 Subject: [PATCH] don't try to escape JID when we get a subscription request from it, it's already escaped. Fixes #7277 --- src/dialogs.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/dialogs.py b/src/dialogs.py index 7d5c8cdb0..768bdbb43 100644 --- a/src/dialogs.py +++ b/src/dialogs.py @@ -952,6 +952,7 @@ class AddNewContactWindow: liststore = Gtk.ListStore(str) self.protocol_jid_combobox.set_model(liststore) if jid: + self.jid_escaped = True type_ = gajim.get_transport_name_from_jid(jid) if not type_: type_ = 'jabber' @@ -986,6 +987,7 @@ class AddNewContactWindow: self.nickname_entry.set_text(user_nick) self.nickname_entry.grab_focus() else: + self.jid_escaped = False self.uid_entry.grab_focus() group_names = [] for acct in accounts: @@ -1062,7 +1064,7 @@ class AddNewContactWindow: model = self.protocol_combobox.get_model() row = self.protocol_combobox.get_active_iter() type_ = model[row][2] - if type_ != 'jabber': + if type_ != 'jabber' and not self.jid_escaped: model = self.protocol_jid_combobox.get_model() row = self.protocol_jid_combobox.get_active() transport = model[row][0]