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

[Daniel Willmann]

The following commit has been merged in the master branch:
commit 8b81d1bfa048fd7d13eca507bb9953be811f3940
Author: Daniel Willmann <daniel at totalueberwachung.de>
Date:   Wed Dec 24 15:46:40 2008 +0100

    ogsmd: Add charset support to more methods and signals
    
    PdpGetNetworkStatus and NetworksStatus signals

diff --git a/framework/subsystems/ogsmd/modems/abstract/mediator.py b/framework/subsystems/ogsmd/modems/abstract/mediator.py
index 124ec5e..b7f5c98 100644
--- a/framework/subsystems/ogsmd/modems/abstract/mediator.py
+++ b/framework/subsystems/ogsmd/modems/abstract/mediator.py
@@ -1443,11 +1443,12 @@ class PdpGetNetworkStatus( PdpMediator ):
             elif response[-1] != "OK" or len( response ) == 1:
                 pass
             else:
+                charset = currentModem()._charsets["DEFAULT"]
                 result[ "registration"] = const.REGISTER_STATUS[int(safesplit( self._rightHandSide( response[-2] ), ',' )[1])]
                 values = safesplit( self._rightHandSide( response[-2] ), ',' )
                 if len( values ) >= 4: # have lac and cid now
-                    result["lac"] = values[2].strip( '"' )
-                    result["cid"] = values[3].strip( '"' )
+                    result["lac"] = values[2].strip( '"' ).decode(charset)
+                    result["cid"] = values[3].strip( '"' ).decode(charset)
                 if len( values ) == 5:
                     result["act"] = const.REGISTER_ACT[ int(values[4]) ]
                 else: # AcT defaults to GSM
diff --git a/framework/subsystems/ogsmd/modems/abstract/unsolicited.py b/framework/subsystems/ogsmd/modems/abstract/unsolicited.py
index d7aea13..b0e7ca9 100644
--- a/framework/subsystems/ogsmd/modems/abstract/unsolicited.py
+++ b/framework/subsystems/ogsmd/modems/abstract/unsolicited.py
@@ -90,12 +90,13 @@ class AbstractUnsolicitedResponseDelegate( object ):
         """
         Gprs Registration Status Update
         """
+        charset = currentModem()._charsets["DEFAULT"]
         values = safesplit( righthandside, ',' )
         status = {}
         status["registration"] = const.REGISTER_STATUS[int(values[0])]
         if len( values ) >= 3:
-            status["lac"] = values[1].strip( '"' )
-            status["cid"] = values[2].strip( '"' )
+            status["lac"] = values[1].strip( '"' ).decode(charset)
+            status["cid"] = values[2].strip( '"' ).decode(charset)
         if len( values ) == 4:
             status["act"] = const.REGISTER_ACT[int(values[3])]
         else: # AcT defaults to GSM
@@ -108,11 +109,12 @@ class AbstractUnsolicitedResponseDelegate( object ):
         """
         Network Registration Status Update
         """
+        charset = currentModem()._charsets["DEFAULT"]
         values = safesplit( righthandside, ',' )
         self.register = const.REGISTER_STATUS[int(values[0])]
         if len( values ) >= 3:
-            self.lac = values[1].strip( '"' )
-            self.cid = values[2].strip( '"' )
+            self.lac = values[1].strip( '"' ).decode(charset)
+            self.cid = values[2].strip( '"' ).decode(charset)
         if len( values ) == 4:
             self.act = const.REGISTER_ACT[int(values[3])]
         else: # AcT defaults to GSM
@@ -208,6 +210,7 @@ class AbstractUnsolicitedResponseDelegate( object ):
             status["lac"] = self.lac
         if self.cid is not None:
             status["cid"] = self.cid
+        status["act"] = self.act
         self._object.Status( status ) # send dbus signal
 
     def statusERR( self, values ):

-- 
FSO frameworkd Debian packaging