Index: /trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- /trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	(revision 2713)
+++ /trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	(revision 2714)
@@ -1,2 +1,7 @@
+2007-08-16  Neil J. Patel  <njp@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@o-hand.com>
 
Index: /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	(revision 2713)
+++ /trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c	(revision 2714)
@@ -426,8 +426,11 @@
     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);
@@ -435,5 +438,6 @@
     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;
@@ -534,4 +538,5 @@
   priv = dialer->priv;
   
+  g_source_remove (priv->reg_timeout);
   moko_keypad_set_pin_mode (MOKO_KEYPAD (priv->keypad), TRUE);
   g_print ("Pin Requested\n");
