r4002 - in trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src/phone-kit

[chris at sita.openmoko.org]

Author: chris
Date: 2008-01-31 12:34:04 +0100 (Thu, 31 Jan 2008)
New Revision: 4002

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-network.c
Log:
        * src/phone-kit/moko-network.c: (stop_retrying_registration),
        (on_network_registered), (on_pin_requested):
        Stop the network registration retrying when a pin request is received


Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2008-01-31 11:28:51 UTC (rev 4001)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2008-01-31 11:34:04 UTC (rev 4002)
@@ -1,5 +1,11 @@
 2008-01-31  Chris Lord  <chris at openedhand.com>
 
+	* src/phone-kit/moko-network.c: (stop_retrying_registration),
+	(on_network_registered), (on_pin_requested):
+	Stop the network registration retrying when a pin request is received
+
+2008-01-31  Chris Lord  <chris at openedhand.com>
+
 	* src/phone-kit/moko-network.c: (retry_register),
 	(on_network_registered), (moko_network_init):
 	Add a 60-second time-out for network registration before retrying

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-network.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-network.c	2008-01-31 11:28:51 UTC (rev 4001)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-network.c	2008-01-31 11:34:04 UTC (rev 4002)
@@ -160,6 +160,16 @@
   }
 }
 
+static void
+stop_retrying_registration (MokoNetwork *network)
+{
+  if (network->priv->retry_register) {
+    g_source_remove (network->priv->retry_register);
+    network->priv->retry_register = 0;
+    network->priv->retry_register_n = RETRY_MAX;
+  }
+}
+
 /* Callbacks for gsmd events */
 static void
 on_network_registered (MokoListener *listener,
@@ -207,11 +217,7 @@
     case GSMD_NETREG_REG_ROAMING:
       g_debug ("Network registered: LocationAreaCode: %x. CellID: %x.", lac, cell);
       
-      if (priv->retry_register) {
-        g_source_remove (priv->retry_register);
-        priv->retry_register = 0;
-        priv->retry_register_n = RETRY_MAX;
-      }
+      stop_retrying_registration ((MokoNetwork *)listener);
       
       /* Retrieve details when we switch location/type */
       if ((priv->registered != type) || (priv->lac != lac)) {
@@ -277,6 +283,9 @@
 
   g_debug ("Pin Requested");
   
+  /* Stop the registering time-out if we receive a pin request */
+  stop_retrying_registration ((MokoNetwork *)listener);
+  
   if (priv->pin_attempts < 3) {
     const char *message;