removed some odd flow control left behind when one of the session negotiation dialogs was removed

This commit is contained in:
Brendan Taylor 2008-08-30 01:31:11 +00:00
parent f64cd6d238
commit 29c6af7e1e
1 changed files with 27 additions and 34 deletions

View File

@ -369,7 +369,6 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
try: try:
# bob responds # bob responds
if form.getType() == 'form' and 'security' in form.asDict(): if form.getType() == 'form' and 'security' in form.asDict():
def continue_with_negotiation():
# we don't support 3-message negotiation as the responder # we don't support 3-message negotiation as the responder
if 'dhkeys' in form.asDict(): if 'dhkeys' in form.asDict():
self.fail_bad_negotiation('3 message negotiation not supported when responding', ('dhkeys',)) self.fail_bad_negotiation('3 message negotiation not supported when responding', ('dhkeys',))
@ -400,12 +399,6 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
else: else:
self.respond_e2e_bob(form, negotiated, not_acceptable) self.respond_e2e_bob(form, negotiated, not_acceptable)
def ignore_negotiation(widget):
self.dialog.destroy()
return
continue_with_negotiation()
return return
# alice accepts # alice accepts