Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorbergstra <james@xo-05-28-3A.localdomain>2008-02-13 02:13:16 (GMT)
committer bergstra <james@xo-05-28-3A.localdomain>2008-02-13 02:13:16 (GMT)
commit123dd9a8b35c9090b244bb6bae388707dbb2443e (patch)
tree40f6121588437e50f2734f1273e05d4247357d87 /common
parent4069e31deead331593be3827b696a98b6ea37e61 (diff)
parentd0e18e63595b6f4f5aabb659f372fa067e1e982f (diff)
Merge branch 'master' of git+ssh://amartin@dev.laptop.org/git/projects/tamtam
Diffstat (limited to 'common')
-rw-r--r--common/Util/Network.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/common/Util/Network.py b/common/Util/Network.py
index dbbc97d..65a15b0 100644
--- a/common/Util/Network.py
+++ b/common/Util/Network.py
@@ -80,7 +80,7 @@ class Listener( threading.Thread ):
def run(self):
while 1: # rely on the owner to kill us when necessary
try:
- inputReady, outputReady, exceptReady = select.select( self.inputSockets, self.outputSockets, self.exceptSockets )
+ inputReady, outputReady, exceptReady = select.select( self.inputSockets, self.outputSockets, self.exceptSockets, 0.5 )
if not len( inputReady ): # timeout
continue
if self.listenerSocket in inputReady:
@@ -549,6 +549,7 @@ class Network:
if MSG_SIZE[con.message] == 0:
con.recvBuf = con.recvBuf[1:]
for func in self.processMessage[con.message]:
+ print "idle_add", func, con.message
gobject.idle_add( func, sock, con.message, "" )
else:
con.waitingForData = MSG_SIZE[con.message]