r2714 - in trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src

[njp at sita.openmoko.org]

Author: njp
Date: 2007-08-16 13:06:01 +0200 (Thu, 16 Aug 2007)
New Revision: 2714

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
Log:
2007-08-16  Neil J. Patel  <njp at o-hand.com>

	* src/moko-dialer.c: (on_network_registered), (on_pin_requested):
	Be smarter when searching for a network, don't keep pinging gsmd.

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-08-16 05:48:59 UTC (rev 2713)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-08-16 11:06:01 UTC (rev 2714)
@@ -1,3 +1,8 @@
+2007-08-16  Neil J. Patel  <njp at o-hand.com>
+
+	* src/moko-dialer.c: (on_network_registered), (on_pin_requested):
+	Be smarter when searching for a network, don't keep pinging gsmd.
+
 2007-08-15  Neil J. Patel  <njp at o-hand.com>
 
 	* src/moko-dialer.c: (on_network_registered):

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c	2007-08-16 05:48:59 UTC (rev 2713)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c	2007-08-16 11:06:01 UTC (rev 2714)
@@ -425,16 +425,20 @@
     case MOKO_GSMD_CONNECTION_NETREG_NONE:
     case MOKO_GSMD_CONNECTION_NETREG_SEARCHING:
       /* Do nothing */
+      g_print ("NetReg: Seraching for network\n");
+      g_source_remove (priv->reg_timeout);
+      priv->registered = TRUE;
       break;
     case MOKO_GSMD_CONNECTION_NETREG_DENIED:
       /* This may be a pin issue*/
-      g_print ("Registration denied, the SIM pin may need to be entered\n");
+      g_print ("NetReg: Registration denied, the SIM pin may be needed\n");
       moko_keypad_set_pin_mode (MOKO_KEYPAD (priv->keypad), TRUE);
       g_source_remove (priv->reg_timeout);
       break;
     case MOKO_GSMD_CONNECTION_NETREG_HOME:
     case MOKO_GSMD_CONNECTION_NETREG_ROAMING:
-      g_print ("Network registered\n");
+      g_print ("NetReg: Network registered\n");
+      g_print("\tLocationAreaCode = %x\n\tCellID = %x", lac, cell);
       g_source_remove (priv->reg_timeout);
       priv->registered = TRUE;
       break;
@@ -533,6 +537,7 @@
   g_return_if_fail (MOKO_IS_DIALER (dialer));
   priv = dialer->priv;
   
+  g_source_remove (priv->reg_timeout);
   moko_keypad_set_pin_mode (MOKO_KEYPAD (priv->keypad), TRUE);
   g_print ("Pin Requested\n");