Changeset 4b0092e

Timestamp:

2008-07-12T20:10:31Z (16 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

6af3e14

Parents:

9033a0a

Message:

skyped: send periodically a 'PING' to the client

also ignore the 'PONG' output from it (so don't forward it to skype)

File:

• skype/skyped.py (modified) (4 diffs)

skype/skyped.py

@@ -64 +64 @@
                 return True
 
-def idle_handler(skype):
+def skype_idle_handler(skype):
         try:
                 c = skype.skype.Command("PING", Block=True)
@@ -70 +70 @@
         except Skype4Py.SkypeAPIError, s:
                 dprint("Warning, pinging Skype failed (%s)." % (s))
+        return True
+
+def bitlbee_idle_handler(skype):
+        if options.conn:
+                try:
+                        e = "PING"
+                        options.conn.send("%s\n" % e)
+                except Exception, s:
+                        dprint("Warning, sending '%s' failed (%s)." % (e, s))
+                        options.conn.close()
         return True
 
@@ -162 +172 @@
 
         def send(self, msg_text):
-                if not len(msg_text):
+                if not len(msg_text) or msg_text == "PONG":
                         return
                 e = msg_text.decode(locale.getdefaultlocale()[1])
@@ -273 +283 @@
         except Skype4Py.SkypeAPIError, s:
                 sys.exit("%s. Are you sure you have started Skype?" % s)
-        gobject.timeout_add(2000, idle_handler, skype)
+        gobject.timeout_add(2000, skype_idle_handler, skype)
+        gobject.timeout_add(60000, bitlbee_idle_handler, skype)
         gobject.MainLoop().run()