From 4fa60f9b3da0759a8ce420db9e8678afead2ea79 Mon Sep 17 00:00:00 2001
From: Zhenchao Li <cockneykevin@gmail.com>
Date: Sun, 8 Aug 2010 16:42:30 +0800
Subject: [PATCH] define pubkey callbacks

---
 src/common/connection_handlers.py | 13 ++++++++++++-
 src/common/xmpp/protocol.py       |  4 ++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index 9b289ca5a..657462203 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -183,7 +183,9 @@ class ConnectionDisco:
         query.setAttr('node', 'http://gajim.org#' + gajim.version.split('-', 1)[0])
         for f in (common.xmpp.NS_BYTESTREAM, common.xmpp.NS_SI,
         common.xmpp.NS_FILE, common.xmpp.NS_COMMANDS, 
-        common.xmpp.NS_JINGLE_FILE_TRANSFER, common.xmpp.NS_JINGLE_XTLS):
+        common.xmpp.NS_JINGLE_FILE_TRANSFER, common.xmpp.NS_JINGLE_XTLS,
+        common.xmpp.NS_PUBKEY_PUBKEY, common.xmpp.NS_PUBKEY_REVOKE,
+        common.xmpp.NS_PUBKEY_ATTEST):
             feature = common.xmpp.Node('feature')
             feature.setAttr('var', f)
             query.addChild(node=feature)
@@ -2238,6 +2240,12 @@ ConnectionCaps, ConnectionHandlersBase, ConnectionJingle):
         for i in iq_obj.getQueryPayload():
             df[i.getName()] = i.getData()
         self.dispatch('SEARCH_FORM', (jid, df, False))
+        
+    def _PubkeyGetCB(self, con, obj):
+        log.info('PubkeyGetCB')
+        
+    def _PubkeyResultCB(self, con, obj):
+        log.info('PubkeyResultCB')
 
     def _StreamCB(self, con, obj):
         if obj.getTag('conflict'):
@@ -2334,3 +2342,6 @@ ConnectionCaps, ConnectionHandlersBase, ConnectionJingle):
         con.RegisterHandler('presence', self._StanzaArrivedCB)
         con.RegisterHandler('message', self._StanzaArrivedCB)
         con.RegisterHandler('unknown', self._StreamCB, 'urn:ietf:params:xml:ns:xmpp-streams', xmlns='http://etherx.jabber.org/streams')
+        con.RegisterHandler('iq', self._PubkeyGetCB, 'get', common.xmpp.NS_PUBKEY_PUBKEY)
+        con.RegisterHandler('iq', self._PubkeyResultCB, 'result', common.xmpp.NS_PUBKEY_PUBKEY)
+
diff --git a/src/common/xmpp/protocol.py b/src/common/xmpp/protocol.py
index 319851570..0f7b4c57c 100644
--- a/src/common/xmpp/protocol.py
+++ b/src/common/xmpp/protocol.py
@@ -131,6 +131,10 @@ NS_DATA_LAYOUT  ='http://jabber.org/protocol/xdata-layout'
 NS_DATA_VALIDATE='http://jabber.org/protocol/xdata-validate'                    # XEP-0122
 NS_XMPP_STREAMS ='urn:ietf:params:xml:ns:xmpp-streams'
 NS_RECEIPTS     ='urn:xmpp:receipts'
+NS_PUBKEY_PUBKEY='urn:xmpp:pubkey:2'                                              # XEP-0189
+NS_PUBKEY_REVOKE='urn:xmpp:revoke:2'
+NS_PUBKEY_ATTEST='urn:xmpp:attest:2'
+
 
 xmpp_stream_error_conditions = '''
 bad-format --  --  -- The entity has sent XML that cannot be processed.