Changeset 4555

Timestamp:

07/25/08 10:23:02 (5 years ago)

Author:

john_lee

Message:

Register() is async. wait for the signal from network interface to
change the registration status.

File:

• developers/john_lee/pyfso/dialer.py (modified) (5 diffs)

developers/john_lee/pyfso/dialer.py

@@ -80 +80 @@
         self.fso = fso
         self.fso.onCallStatus.append(self.on_call_status)
+        self.fso.onNetworkStatus.append(self.on_network_status)
         self._set_state('release')
         from threading import Thread
@@ -85 +86 @@
 
     def _init(self):
+        if not self.fso.gsm_device_iface.GetAntennaPower():
+            self.fso.gsm_device_iface.SetAntennaPower(True)
         if self.fso.gsm_network_iface.GetStatus()['registration'] == 'unregistered':
             try:
-                self.fso.gsm_device_iface.SetAntennaPower(True)
                 self.fso.gsm_network_iface.Register()
-                print 'registered'
-                self.registered = True
             except DBusException, e:
                 # FIXME pin number?
                 print e
-                self.registered = False
 
     @need_registered
@@ -108 +107 @@
         self.fso.gsm_call_iface.Activate(self.callid)
 
-    @need_registered
     def on_call_status(self, id, status, properties):
         self._set_state(status)
         self.callid = id
+
+    def on_network_status(self, status):
+        print 'signal network status:', status
+        if status['registration'] == 'home':
+            self.registered = True
+        elif status['registration'] == 'roaming':
+            self.registered = True
 
 
@@ -117 +122 @@
     from dbus.mainloop.glib import DBusGMainLoop
     from fso_backend import FSOObject
-    try:
+pp    try:
         dialer = FSODialer(FSOObject(SystemBus(mainloop=DBusGMainLoop())))
     except DBusException:
@@ -127 +132 @@
         return
 
+
 if __name__ == "__main__":
     _test_fso()