[pkg-fso-commits] [SCM] framworkd debian packageing branch, master, updated. milestone2-89-geb27523

[Daniel Willmann]

The following commit has been merged in the master branch:
commit 57e37518d4dface14a6450c56490b8e75fe7d1e5
Author: Daniel Willmann <daniel at totalueberwachung.de>
Date:   Thu Aug 14 15:43:28 2008 +0200

    ogpsd: Some minor (cosmetic) modifications to File- and UDPChannel

diff --git a/framework/subsystems/ogpsd/gpschannel.py b/framework/subsystems/ogpsd/gpschannel.py
index a039848..53390a7 100644
--- a/framework/subsystems/ogpsd/gpschannel.py
+++ b/framework/subsystems/ogpsd/gpschannel.py
@@ -27,6 +27,9 @@ class GPSChannel( object ):
     def setCallback( self, callback ):
         self.callback = callback
 
+    def send( self, stream ):
+        raise Exception( "Not implemented" )
+
 class UDPChannel ( GPSChannel ):
     """UDP reader, for gta01, gllin"""
 
@@ -37,7 +40,7 @@ class UDPChannel ( GPSChannel ):
         self.s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         self.s.bind(('', self.port))
         self.s.setblocking(False)
-        gobject.io_add_watch( self.s.makefile(), gobject.IO_IN, self.readyToRead )
+        self.watchReadyToRead = gobject.io_add_watch( self.s.makefile(), gobject.IO_IN, self.readyToRead )
 
     def readyToRead( self, source, condition ):
         data = self.s.recv(1024)
@@ -46,9 +49,6 @@ class UDPChannel ( GPSChannel ):
 
         return True
 
-    def readyToSend( self, source, condition ):
-        return False
-
 class FileChannel ( GPSChannel ):
     """File reader, for gta01, gllin"""
 
@@ -56,7 +56,7 @@ class FileChannel ( GPSChannel ):
         super(FileChannel, self).__init__()
         logger.debug("FileChannel opens %s" % path)
         self.fd = os.open(path, os.O_NONBLOCK + os.O_RDONLY)
-        gobject.io_add_watch( self.fd, gobject.IO_IN, self.readyToRead )
+        self.watchReadyToRead = gobject.io_add_watch( self.fd, gobject.IO_IN, self.readyToRead )
 
     def readyToRead( self, source, condition ):
         data_array = []
@@ -74,10 +74,6 @@ class FileChannel ( GPSChannel ):
 
         return True
 
-    def readyToSend( self, source, condition ):
-        return False
-
-
 class SerialChannel( GPSChannel ):
     """Serial reader"""
 

-- 
framworkd debian packageing