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

fixed presence leaks

This commit is contained in:
Brendan Taylor 2007-07-05 21:30:09 +00:00
parent 29c44d8a5e
commit ccac0b4299
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/gajim.py
View File

@ -1664,10 +1664,17 @@ class Interface:
session.cancelled_negotiation()
return
# encrypted session states. these are descriped in stanza_session.py
# encrypted session states. these are described in stanza_session.py
# bob responds
if form.getType() == 'form' and u'e2e' in map(lambda x: x[1], form.getField('security').getOptions()):
if form.getType() == 'form' and u'e2e' in \
map(lambda x: x[1], form.getField('security').getOptions()):
contact = gajim.contacts.get_contact(account, jid.getStripped(), jid.getResource())
if gajim.SHOW_LIST[gajim.connections[account].connected] == 'invisible' or \
contact.sub not in ('from', 'both'):
return
negotiated, not_acceptable, ask_user = session.verify_options_bob(form)
if ask_user:
@ -1685,7 +1692,11 @@ class Interface:
dialog.destroy()
dialog = dialogs.YesNoDialog(_('Confirm these session options'),
_('The remote client wants to negotiate an session with these features:\n\n%s\n\nAre these options acceptable?') % (negotiation.describe_features(ask_user)),
_('''The remote client wants to negotiate an session with these features:
%s
Are these options acceptable?''') % (negotiation.describe_features(ask_user)),
on_response_yes = accept_nondefault_options,
on_response_no = reject_nondefault_options)
else: