[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone4-368-g700ab82

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit 0d8946023f97d56d731202a9b0393164d5f2a63a
Author: Guillaume Chereau <charlie at openmoko.org>
Date:   Fri Nov 28 12:19:43 2008 +0800

    ogsmd: Fix a bug when using singleline channel
    
    This patch add the methods `setIntermediateResponseCallback` and
    `handleUnsolicitedResponse` into AbstractModemChannel.

diff --git a/framework/subsystems/ogsmd/modems/abstract/channel.py b/framework/subsystems/ogsmd/modems/abstract/channel.py
index bc134b5..855cedf 100644
--- a/framework/subsystems/ogsmd/modems/abstract/channel.py
+++ b/framework/subsystems/ogsmd/modems/abstract/channel.py
@@ -15,12 +15,17 @@ from ogsmd.gsm.decor import logged
 from ogsmd.gsm.channel import AtCommandChannel
 import gobject
 
+import logging
+logger = logging.getLogger( 'ogsmd' )
+
+
 #=========================================================================#
 class AbstractModemChannel( AtCommandChannel ):
 #=========================================================================#
 
     def __init__( self, *args, **kwargs ):
         AtCommandChannel.__init__( self, *args, **kwargs )
+        self.callback = None
 
         # NOTE: might make it a weak-reference, so that garbage collection
         #       does not get disturbed by the cirular modem/channel reference
@@ -140,3 +145,13 @@ class AbstractModemChannel( AtCommandChannel ):
 
         c = []
         self._commands["resume"] = c
+
+    def setIntermediateResponseCallback( self, callback ):
+        assert self.callback is None, "callback already set"
+        self.callback = callback
+
+    def handleUnsolicitedResponse( self, response ):
+        if self.callback is not None:
+            self.callback( response )
+        else:
+            logger.warning( "UNHANDLED INTERMEDIATE: %s", response )

-- 
FSO frameworkd Debian packaging