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

fix tb

This commit is contained in:
Nikos Kouremenos 2006-03-19 14:59:17 +00:00
parent 540103f381
commit 85fbcb79e9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/connection_handlers.py
View File

@ -27,6 +27,7 @@ from encodings.punycode import punycode_encode
import socks5 import socks5
import common.xmpp import common.xmpp
from common import GnuPG
from common import helpers from common import helpers
from common import gajim from common import gajim
from common import i18n from common import i18n
@ -1229,7 +1230,7 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco)
if not msgtxt and chatstate_child.getTag('composing'): if not msgtxt and chatstate_child.getTag('composing'):
chatstate = 'composing' chatstate = 'composing'
if encTag and USE_GPG: if encTag and GnuPG.USE_GPG:
#decrypt #decrypt
encmsg = encTag.getData() encmsg = encTag.getData()
@ -1315,7 +1316,7 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco)
except: except:
prio = 0 prio = 0
keyID = '' keyID = ''
if sigTag and USE_GPG: if sigTag and GnuPG.USE_GPG:
#verify #verify
sigmsg = sigTag.getData() sigmsg = sigTag.getData()
keyID = self.gpg.verify(status, sigmsg) keyID = self.gpg.verify(status, sigmsg)
@ -1655,4 +1656,4 @@ class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco)
con.RegisterHandler('iq', self._IqCB) con.RegisterHandler('iq', self._IqCB)
con.RegisterHandler('iq', self._StanzaArrivedCB) con.RegisterHandler('iq', self._StanzaArrivedCB)
con.RegisterHandler('presence', self._StanzaArrivedCB) con.RegisterHandler('presence', self._StanzaArrivedCB)
con.RegisterHandler('message', self._StanzaArrivedCB) con.RegisterHandler('message', self._StanzaArrivedCB)