changeset 0a80e5eef4d2 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=0a80e5eef4d2 description: fix some data conversion. jid is a xmpp.JID instance

diffstat:

src/session.py | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (24 lines):

diff -r 42651bfe5568 -r 0a80e5eef4d2 src/session.py --- a/src/session.py Fri Jul 22 11:18:26 2011 +0200 +++ b/src/session.py Sat Jul 23 23:03:46 2011 +0200 @@ -526,10 +526,11 @@ # 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 @@ 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)