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

fix some data conversion. jid is a xmpp.JID instance

This commit is contained in:
Yann Leboulanger 2011-07-23 23:03:46 +02:00
parent ad7f389a91
commit 0c65ea1ce6
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/session.py
View File

@ -526,10 +526,11 @@ Are these options acceptable?''') % (negotiation.describe_features(
# around to test my test suite. # around to test my test suite.
if form.getType() == 'form': if form.getType() == 'form':
if not self.control: 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 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: if not contact:
contact = gajim.contacts.create_contact(jid=jid, account=account, 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, gajim.interface.new_chat(contact, account, resource=resource,
session=self) session=self)
negotiation.FeatureNegotiationWindow(account, self.jid, self, form) negotiation.FeatureNegotiationWindow(account, str(self.jid), self,
form)