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

[Jan Luebbe]

The following commit has been merged in the master branch:
commit 6dd79cd0b1b392f1968968f1611953749695d7ee
Merge: ba7db159ca139cdf7b1c0edc99cba647bea72c0c f1eb74a963ec6cd638d878f9df00e77c9b212af3
Author: Jan Luebbe <jluebbe at debian.org>
Date:   Thu Nov 13 20:36:12 2008 +0100

    Merge branch 'stabilization/milestone4'

diff --combined framework/subsystems/ogsmd/modems/abstract/mediator.py
index 776942f,7e8e44f..5941c37
--- a/framework/subsystems/ogsmd/modems/abstract/mediator.py
+++ b/framework/subsystems/ogsmd/modems/abstract/mediator.py
@@@ -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 )
@@@ -1095,8 -1095,10 +1095,10 @@@ class NetworkSendUssdRequest( NetworkMe
  #=========================================================================#
      def trigger( self ):
          # FIXME request code validation
+         # when using UCS2 we need to encode the request, although it is just a number :/
+         request = convert.UnicodeToucs2hex( self.request )
          commchannel = self._object.modem.communicationChannel( "UnsolicitedMediator" ) # exceptional, since CUSD is semi-unsolicited
-         commchannel.enqueue( '+CUSD=1,"%s",15' % self.request, self.responseFromChannel, self.errorFromChannel )
+         commchannel.enqueue( '+CUSD=1,"%s",15' % request, self.responseFromChannel, self.errorFromChannel )
  
  #
  # Call Mediators

-- 
FSO frameworkd Debian packaging