diff options
Diffstat (limited to 'common/Util/Network.py')
| -rw-r--r-- | common/Util/Network.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/common/Util/Network.py b/common/Util/Network.py index e704a6a..79fbab5 100644 --- a/common/Util/Network.py +++ b/common/Util/Network.py @@ -18,8 +18,8 @@ import xdrlib import random import time -from gi.repository import Gtk -from gi.repository import GObject +import gtk +import gobject import common.Config as Config PORT = 24460 @@ -92,12 +92,12 @@ class Listener( threading.Thread ): continue else: break # exit thread - Gdk.threads_enter() + gtk.gdk.threads_enter() self.owner._processSockets( inputReady ) - Gdk.threads_leave() + gtk.gdk.threads_leave() except socket.error, (value, message): print "Listener:: socket error: " + message - Gdk.threads_leave() + gtk.gdk.threads_leave() break class Connection: @@ -292,7 +292,7 @@ class Network: print "Network::introducePeer:: FAILED to open socket: " + message return if poke.connect_ex( (ip, WAIT_PORT) ): # failed to connect - GObject.timeout_add( 500, self._pokePeer, poke, ip, 0 ) + gobject.timeout_add( 500, self._pokePeer, poke, ip, 0 ) else: # connected if Config.DEBUG > 1: print "Netwtork:: introduction succeeded" poke.close() @@ -302,7 +302,7 @@ class Network: if retry > 120: # give up print "Network::introducePeer:: peer failed to respond after 60 seconds, giving up!" else: - GObject.timeout_add( 500, self._pokePeer, poke, ip, retry+1 ) + gobject.timeout_add( 500, self._pokePeer, poke, ip, retry+1 ) else: # connected if Config.DEBUG > 1: print "Netwtork:: introduction succeeded" poke.close() @@ -539,7 +539,7 @@ class Network: con.recvBuf = con.recvBuf[con.waitingForData:] con.waitingForData = 0 for func in self.processMessage[con.message]: - GObject.idle_add( func, sock, con.message, data ) + gobject.idle_add( func, sock, con.message, data ) else: return # wait for more data @@ -548,7 +548,7 @@ class Network: if MSG_SIZE[con.message] == 0: con.recvBuf = con.recvBuf[1:] for func in self.processMessage[con.message]: - GObject.idle_add( func, sock, con.message, "" ) + gobject.idle_add( func, sock, con.message, "" ) else: con.waitingForData = MSG_SIZE[con.message] con.recvBuf = con.recvBuf[1:] |