[pkg-fso-commits] [SCM] FSO frameworkd Debian packaging branch, debian, updated. upstream/0.9.5.5-717-g0f98819

[Michael 'Mickey' Lauer]

The following commit has been merged in the debian branch:
commit 6df146d1485aca134a8b564d1b6ea9fcb8d29cac
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Fri Aug 7 14:53:05 2009 +0200

    ogsmd: fix GetCallForwarding unhandled exception in response callback. Closes #462
    Thanks to 'Michael' (please include your E-Mail address, if you want proper credit ;)

diff --git a/framework/subsystems/ogsmd/modems/abstract/mediator.py b/framework/subsystems/ogsmd/modems/abstract/mediator.py
index 83e7a81..39595e3 100644
--- a/framework/subsystems/ogsmd/modems/abstract/mediator.py
+++ b/framework/subsystems/ogsmd/modems/abstract/mediator.py
@@ -22,7 +22,7 @@ TODO:
  * refactor parameter validation
 """
 
-__version__ = "0.9.19.0"
+__version__ = "0.9.19.1"
 MODULE_NAME = "ogsmd.modems.abstract.mediator"
 
 from ogsmd import error as DBusError
@@ -1325,6 +1325,14 @@ class NetworkRegisterWithProvider( NetworkMediator ):
         self._commchannel.enqueue( '+COPS=1,2,"%s"' % opcode, self.responseFromChannel, self.errorFromChannel )
 
 #=========================================================================#
+class NetworkRegisterWithProvider( NetworkMediator ):
+#=========================================================================#
+    def trigger( self ):
+        charset = currentModem()._charsets["DEFAULT"]
+        opcode = self.operator_code.encode(charset)
+        self._commchannel.enqueue( '+COPS=1,2,"%s"' % opcode, self.responseFromChannel, self.errorFromChannel )
+
+#=========================================================================#
 class NetworkGetCountryCode( NetworkMediator ):
 #=========================================================================#
     def trigger( self ):
@@ -1368,7 +1376,7 @@ class NetworkGetCallForwarding( NetworkMediator ): # a{sv}
                     result = {}
                     break
                 else:
-                    result[ const.CALL_FORWARDING_CLASS[class_] ] = ( enabled, const.phonebookTupleToNumber( number, ntype ), seconds )
+                    result[ const.CALL_FORWARDING_CLASS.revlookup(class_) ] = ( enabled, const.phonebookTupleToNumber( number, ntype ), seconds )
             self._ok( result )
         else:
             NetworkMediator.responseFromChannel( self, request, response )

-- 
FSO frameworkd Debian packaging