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

[Daniel Willmann]

The following commit has been merged in the master branch:
commit 46fd8ed54877d5bc6e7bf4995a81e6228f791cfd
Merge: b4b1aa60700495a63325df4b62b9ac7add9e43b3 1e3c0641e262f5dd9281cbdee5b72ed98e7e069e
Author: Daniel Willmann <daniel at totalueberwachung.de>
Date:   Tue Oct 28 16:47:45 2008 +0100

    Merge commit 'origin/stabilization/milestone4'
    
    Conflicts:
    
    	framework/subsystems/ogsmd/modems/abstract/mediator.py
    (changed dir -> direction since dir is a python builtin)

diff --combined framework/subsystems/ogsmd/modems/abstract/mediator.py
index 703d70b,471de43..f25f88e
--- a/framework/subsystems/ogsmd/modems/abstract/mediator.py
+++ b/framework/subsystems/ogsmd/modems/abstract/mediator.py
@@@ -760,14 -760,14 +760,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:
@@@ -790,14 -790,14 +790,14 @@@ class SimRetrieveMessage( SimMediator )
                      #print "line is header line"
                      header = const.PAT_SMS_PDU_HEADER_SINGLE.match( self._rightHandSide(line) )
                      status = const.SMS_PDU_STATUS_OUT[int(header.groupdict()["status"])]
-                     if status <= 1:
+                     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 )
@@@ -866,8 -866,13 +866,8 @@@ class SmsSendMessage( SmsMediator )
          sms.pdu_mti = 1
          sms.pid = 0
          sms.dcs = 0
 -        if self.number[0] == "+":
 -            number = self.number[1:]
 -            ntype = 1
 -        else:
 -            number = self.number
 -            ntype = 2
 -        sms.oa = ogsmd.gsm.sms.PDUAddress( ntype, 1, number )
 +        # Use PDUAddress
 +        sms.oa = ogsmd.gsm.sms.PDUAddress.guess( self.number )
          sms.ud = self.contents
          sms.featureMap = self.featuremap
          pdu = sms.pdu()

-- 
FSO frameworkd Debian packaging