Author: asterix Date: 2009-01-16 16:01:36 +0100 (Fri, 16 Jan 2009) New Revision: 10986
Modified: trunk/src/chat_control.py trunk/src/common/connection.py Log: don't allow to send xhtml when gpg is active (because this part is not encrypted). Fixes #4650
Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2009-01-15 17:54:28 UTC (rev 10985) +++ trunk/src/chat_control.py 2009-01-16 15:01:36 UTC (rev 10986) @@ -1232,7 +1232,8 @@ def update_toolbar(self): # Formatting if gajim.capscache.is_supported(self.contact, NS_XHTML_IM) \ - and not gajim.capscache.is_supported(self.contact, 'notexistant'): + and not gajim.capscache.is_supported(self.contact, 'notexistant') \ + and not self.gpg_is_active: self._formattings_button.set_sensitive(True) else: self._formattings_button.set_sensitive(False)
Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2009-01-15 17:54:28 UTC (rev 10985) +++ trunk/src/common/connection.py 2009-01-16 15:01:36 UTC (rev 10986) @@ -1162,6 +1162,7 @@ fjid = str(session.jid)
if keyID and self.USE_GPG: + xhtml = None if keyID == 'UNKNOWN': error = _('Neither the remote presence is signed, nor a key was assigned.') elif keyID.endswith('MISMATCH'):