0
@@ -13,6 +13,7 @@ from twisted.protocols import memcache
0
 
0
 from wokkel.xmppim import MessageProtocol, PresenceClientProtocol
0
 from wokkel.xmppim import AvailablePresence
0
+from wokkel import ping
0
 
0
 import xmpp_commands
0
 import config
0
@@ -83,19 +84,15 @@ class TwitterspyMessageProtocol(MessageProtocol):
0
         return prefix + str(self._pubid)
0
 
0
     def ping(self, fromjid, tojid):
0
-        iq = IQ(self.xmlstream, 'get')
0
-        iq['from'] = config.SCREEN_NAME
0
-        iq['to'] = tojid
0
-        iq.addElement(("urn:xmpp:ping", 'ping'))
0
-        d = iq.send()
0
-        start_time = time.time()
0
-        log.msg("Sending ping %s" % iq.toXml())
0
+        p = ping.Ping(self.xmlstream, config.SCREEN_NAME, tojid)
0
+        d = p.send()
0
+        log.msg("Sending ping %s" % p.toXml())
0
         def _gotPing(x):
0
-            duration = time.time() - start_time
0
+            duration = time.time() - p.start_time
0
             log.msg("pong %s" % tojid)
0
             self.send_plain(fromjid, "Pong (%s) - %fs" % (tojid, duration))
0
         def _gotError(x):
0
-            duration = time.time() - start_time
0
+            duration = time.time() - p.start_time
0
             log.msg("Got an error pinging %s: %s" % (tojid, x))
0
             self.send_plain(fromjid, "Error pinging %s (%fs): %s" % (tojid, duration, x))
0
         d.addCallback(_gotPing)

0
@@ -1 +1 @@
0
-Subproject commit 2ce0add5793051f841b502f99caff1c251c0ad05
0
+Subproject commit 18796ca973db33d65bf3a6653c95d715e0c82a79