[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, master, updated. milestone3-274-gd9a0e57

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit 19951f80da73e5739e6d4ceb28b0d11c9cc53d74
Merge: 5202e7d02890bd48736929af83a569ce7b9193ce 6f7db0edde1849741f2edd162467f7e61fd2fbf0
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Fri Oct 31 23:22:33 2008 +0100

    Merge commit 'origin/stabilization/milestone4'

diff --combined framework/subsystems/ogsmd/modems/abstract/mediator.py
index bb02d18,c6cd1b1..cb80718
--- a/framework/subsystems/ogsmd/modems/abstract/mediator.py
+++ b/framework/subsystems/ogsmd/modems/abstract/mediator.py
@@@ -21,7 -21,7 +21,7 @@@ TODO
   * refactor parameter validation
  """
  
- __version__ = "0.9.9.1"
+ __version__ = "0.9.9.2"
  
  from ogsmd.gsm import error, const, convert
  from ogsmd.gsm.decor import logged
@@@ -762,14 -762,14 +762,14 @@@ class SimRetrieveMessagebook( SimMediat
                      index = int(header.groupdict()["index"])
                      status = const.SMS_PDU_STATUS_OUT[int(header.groupdict()["status"])]
                      if "read" in status:
 -                      dir = "MT"
 +                      direction = "MT"
                      else:
 -                      dir = "MO"
 +                      direction = "MO"
                      length = int(header.groupdict()["pdulen"])
                  else:
                      # Now we decode the actual PDU
  
 -                    sms = ogsmd.gsm.sms.decodeSMS( line, dir)
 +                    sms = ogsmd.gsm.sms.decodeSMS( line, direction)
                      result.append( ( index, status, str(sms.oa), sms.ud, sms.featureMap ) )
              self._ok( result )
          else:
@@@ -793,13 -793,13 +793,13 @@@ class SimRetrieveMessage( SimMediator )
                      header = const.PAT_SMS_PDU_HEADER_SINGLE.match( self._rightHandSide(line) )
                      status = const.SMS_PDU_STATUS_OUT[int(header.groupdict()["status"])]
                      if "read" in status:
 -                      dir = "MT"
 +                      direction = "MT"
                      else:
 -                      dir = "MO"
 +                      direction = "MO"
                      length = int(header.groupdict()["pdulen"])
                  else:
                      # Now we decode the actual PDU
 -                    sms = ogsmd.gsm.sms.decodeSMS( line, dir )
 +                    sms = ogsmd.gsm.sms.decodeSMS( line, direction )
                      result = ( status, str(sms.oa), sms.ud, sms.featureMap )
  
              self._ok( *result )
@@@ -1068,6 -1068,7 +1068,7 @@@ class NetworkDisableCallForwarding( Net
  class NetworkGetCallingIdentification( NetworkMediator ): # s
  #=========================================================================#
      def trigger( self ):
+         self._commchannel = self._object.modem.communicationChannel( "CallMediator" ) # exceptional, since this is a call-specific command
          self._commchannel.enqueue( "+CLIR?", self.responseFromChannel, self.errorFromChannel )
  
      @logged
@@@ -1086,7 -1087,7 +1087,7 @@@ class NetworkSetCallingIdentification( 
              restriction = const.CALL_IDENTIFICATION_RESTRICTION[self.status]
          except KeyError:
              self._error( error.InvalidParameter( "valid restrictions are %s" % const.CALL_IDENTIFICATION_RESTRICTION.keys() ) )
- 
+         self._commchannel = self._object.modem.communicationChannel( "CallMediator" ) # exceptional, since this is a call-specific command
          self._commchannel.enqueue( "+CLIR=%d" % restriction, self.responseFromChannel, self.errorFromChannel )
  
  #=========================================================================#

-- 
FSO frameworkd Debian packaging