Changeset 2705

Timestamp:

08/15/07 15:26:57 (6 years ago)

Author:

njp

Message:

2007-08-15 Neil J. Patel <njp@…>

• src/moko-dialer.c: (on_keypad_pin_entry), (on_network_registered), (moko_dialer_init): Check for registration type, and take the right action.

Location:

trunk/src/target/OM-2007.2/applications/openmoko-dialer2

Files:

• ChangeLog (modified) (1 diff)
• src/moko-dialer.c (modified) (4 diffs)

trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog

@@ +1 @@
+2007-08-15  Neil J. Patel  <njp@o-hand.com>
+
+        * src/moko-dialer.c: (on_keypad_pin_entry),
+        (on_network_registered), (moko_dialer_init):
+        Check for registration type, and take the right action.
+
 2007-08-15  Neil J. Patel  <njp@o-hand.com>
 

trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c

@@ -69 +69 @@
 
   /* Registration variables */
+  guint               reg_timeout;
   gboolean            reg_request;
   gboolean            registered;
@@ -296 +297 @@
   priv->reg_request = TRUE;
   priv->registered = FALSE;
-  g_timeout_add (GSM_REGISTER_TIMEOUT, 
-                 (GSourceFunc)register_network_cb, 
-                 dialer);
+  priv->reg_timeout = g_timeout_add (GSM_REGISTER_TIMEOUT, 
+                                     (GSourceFunc)register_network_cb, 
+                                     dialer);
 }
 
@@ -418 +419 @@
   priv = dialer->priv;
 
-  g_print ("Register type = %d\n");
-
-  priv->registered = TRUE;
+  switch (type)
+  {
+    case MOKO_GSMD_CONNECTION_NETREG_NONE:
+    case MOKO_GSMD_CONNECTION_NETREG_SEARCHING:
+      /* Do nothing */
+      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");
+      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:
+      priv->registered = TRUE;
+      break;
+    default:
+      g_warning ("Unhandled register event type = %d\n", type);
+   };
 }
 
@@ -728 +745 @@
   priv->reg_request = TRUE;
   priv->registered = FALSE;
-  g_timeout_add (GSM_REGISTER_TIMEOUT, 
-                 (GSourceFunc)register_network_cb, 
-                 dialer);
+  priv->reg_timeout = g_timeout_add (GSM_REGISTER_TIMEOUT, 
+                                     (GSourceFunc)register_network_cb, 
+                                     dialer);
   
   /* Connect to the gsmd signals */