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

Revert r9682, it was a bad idea. The solution is not to send the 

thread id, but to even remove the lock symbol when OTR was ended
and we don't have a thread id.
This commit is contained in:
js 2008-05-19 20:13:24 +00:00
parent abe75901d4
commit f1c333410e
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/chat_control.py
View File

@ -2406,9 +2406,8 @@ class ChatControl(ChatControlBase):
def _on_end_otr_menuitem_activate(self, widget): def _on_end_otr_menuitem_activate(self, widget):
fjid = self.contact.get_full_jid() fjid = self.contact.get_full_jid()
gajim.otr_module.otrl_message_disconnect( gajim.otr_module.otrl_message_disconnect(
self.session.conn.otr_userstates, self.session.conn.otr_userstates, (gajim.otr_ui_ops,
(gajim.otr_ui_ops, {'account': self.account, {'account': self.account, 'urgent': True}),
'urgent': True, 'session': self.session}),
gajim.get_jid_from_account(self.account).encode(), gajim.get_jid_from_account(self.account).encode(),
gajim.OTR_PROTO, fjid.encode()) gajim.OTR_PROTO, fjid.encode())
gajim.otr_ui_ops.gajim_log(_('Private conversation with ' \ gajim.otr_ui_ops.gajim_log(_('Private conversation with ' \

3
src/gajim.py
View File

@ -375,9 +375,6 @@ class OtrlMessageAppOps:
# disconnect from OTR sessions before quitting # disconnect from OTR sessions before quitting
stanza = XmppMessage(to = recipient, stanza = XmppMessage(to = recipient,
body = message, typ='chat') body = message, typ='chat')
if 'session' in opdata:
stanza.setThread(opdata['session'].thread_id)
gajim.connections[opdata['account']].connection. \ gajim.connections[opdata['account']].connection. \
send(stanza, now = True) send(stanza, now = True)
return return