diff options
| author | Yann Leboulanger <asterix@lagaule.org> | 2011-07-24 01:03:46 +0400 |
|---|---|---|
| committer | Yann Leboulanger <asterix@lagaule.org> | 2011-07-24 01:03:46 +0400 |
| commit | 0c65ea1ce66155564fa123525a46c77f23d3d07a (patch) | |
| tree | ecba566f61d1f821419ba4232134b00d15ee96d8 /src/session.py | |
| parent | ad7f389a912b8237b5a857453d493853d0ef9da3 (diff) | |
fix some data conversion. jid is a xmpp.JID instance
Diffstat (limited to 'src/session.py')
| -rw-r--r-- | src/session.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/session.py b/src/session.py index 4a7b62e76..a4e9de595 100644 --- a/src/session.py +++ b/src/session.py @@ -526,10 +526,11 @@ Are these options acceptable?''') % (negotiation.describe_features( # around to test my test suite. if form.getType() == 'form': if not self.control: - jid, resource = gajim.get_room_and_nick_from_fjid(self.jid) + jid, resource = gajim.get_room_and_nick_from_fjid(str(self.jid)) account = self.conn.name - contact = gajim.contacts.get_contact(account, self.jid, resource) + contact = gajim.contacts.get_contact(account, str(self.jid), + resource) if not contact: contact = gajim.contacts.create_contact(jid=jid, account=account, @@ -538,4 +539,5 @@ Are these options acceptable?''') % (negotiation.describe_features( gajim.interface.new_chat(contact, account, resource=resource, session=self) - negotiation.FeatureNegotiationWindow(account, self.jid, self, form) + negotiation.FeatureNegotiationWindow(account, str(self.jid), self, + form) |