Author: liori Date: 2007-08-15 11:28:32 +0200 (Wed, 15 Aug 2007) New Revision: 8495

Modified: branches/jingle/src/common/xmpp/transports_nb.py branches/jingle/src/gajim.py Log: Jingle: removing hacks, rising the priority for io_add_watch callbacks.

Modified: branches/jingle/src/common/xmpp/transports_nb.py =================================================================== --- branches/jingle/src/common/xmpp/transports_nb.py 2007-08-13 16:17:22 UTC (rev 8494) +++ branches/jingle/src/common/xmpp/transports_nb.py 2007-08-15 09:28:32 UTC (rev 8495) @@ -586,7 +586,6 @@ '''Append raw_data to the queue of messages to be send. If supplied data is unicode string, encode it to utf-8. ''' - now = True if self.state <= 0: return r = raw_data

Modified: branches/jingle/src/gajim.py =================================================================== --- branches/jingle/src/gajim.py 2007-08-13 16:17:22 UTC (rev 8494) +++ branches/jingle/src/gajim.py 2007-08-15 09:28:32 UTC (rev 8495) @@ -367,8 +367,7 @@ ''' this method is called when we plug a new idle object. Start listening for events from fd ''' - res = gobject.io_add_watch(fd, flags, self.process_events, - priority=gobject.PRIORITY_LOW) + res = gobject.io_add_watch(fd, flags, self.process_events) # store the id of the watch, so that we can remove it on unplug self.events[fd] = res @@ -2369,7 +2368,7 @@ # pygtk2.8+ on win, breaks io_add_watch. # We use good old select.select() - if True or os.name == 'nt': + if os.name == 'nt': gajim.idlequeue = idlequeue.SelectIdleQueue() else: # in a nongui implementation, just call: