Author: bct Date: 2007-07-17 10:26:14 +0200 (Tue, 17 Jul 2007) New Revision: 8406

Modified: branches/e2e_encryption/src/gajim.py Log: don't prompt to negotiate if we have mutual subscription

Modified: branches/e2e_encryption/src/gajim.py =================================================================== --- branches/e2e_encryption/src/gajim.py 2007-07-17 08:08:27 UTC (rev 8405) +++ branches/e2e_encryption/src/gajim.py 2007-07-17 08:26:14 UTC (rev 8406) @@ -1744,9 +1744,11 @@ def ignore_negotiation(widget): self.dialog.destroy() return - - contact = gajim.contacts.get_contact_with_highest_priority(account, str(jid)) - + + contact = gajim.contacts.get_contact(account, jid.getStripped(), jid.getResource()) + + # FIXME: shouldn't prompt if i don't have a subscription for remote but + # he has one for me. get_contact() returns None in this case? if gajim.SHOW_LIST[gajim.connections[account].connected] == 'invisible' or not contact or\ contact.sub not in ('from', 'both'): self.dialog = dialogs.YesNoDialog(_('Start session?'),