[commit-gajim] r10194 - trunk/src/common - Commits

11 Aug 2008

Author: asterix
Date: 2008-08-11 17:30:24 +0200 (Mon, 11 Aug 2008)
New Revision: 10194
Modified:
   trunk/src/common/connection_handlers.py
Log:
don't take into account keyid in error presence: it's our own signed message
Modified: trunk/src/common/connection_handlers.py
===================================================================

--- trunk/src/common/connection_handlers.py	2008-08-11 15:22:56 UTC (rev 10193)
+++ trunk/src/common/connection_handlers.py	2008-08-11 15:30:24 UTC (rev 10194)
@@ -1974,7 +1974,8 @@
    	except:
    		prio = 0
    	keyID = ''
-		if sigTag and self.USE_GPG:
+		if sigTag and self.USE_GPG and ptype != 'error':
+			# error presences contain our own signature
    		# verify
    		sigmsg = sigTag.getData()
    		keyID = self.gpg.verify(status, sigmsg)

    