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

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-11-28 13:06:44 +0100 (Wed, 28 Nov 2007)
New Revision: 3525

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
Log:
* src/phone-kit/moko-dialer.c: (dialer_init_gsmd):
- Add back PIN handler registration
- Correct error handling from lgsm_phone_power


Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-11-28 09:19:55 UTC (rev 3524)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-11-28 12:06:44 UTC (rev 3525)
@@ -1,5 +1,11 @@
 2007-11-28  Thomas Wood  <thomas at openedhand.com>
 
+	* src/phone-kit/moko-dialer.c: (dialer_init_gsmd):
+	- Add back PIN handler registration
+	- Correct error handling from lgsm_phone_power
+
+2007-11-28  Thomas Wood  <thomas at openedhand.com>
+
 	* src/phone-kit/moko-dialer.c: (dialer_init_gsmd): Connect gsmd handlers
 	before setting phone power
 

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c	2007-11-28 09:19:55 UTC (rev 3524)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c	2007-11-28 12:06:44 UTC (rev 3525)
@@ -94,7 +94,6 @@
   /* Registration variables */
   enum lgsm_netreg_state registered;
   MokoGSMLocation    gsm_location;
-  gboolean           pin_requested;
 };
 
 enum
@@ -1117,11 +1116,12 @@
   lgsm_evt_handler_register (priv->handle, GSMD_EVT_IN_DS, gsmd_eventhandler);
   lgsm_evt_handler_register (priv->handle, GSMD_EVT_NETREG, gsmd_eventhandler);
   lgsm_evt_handler_register (priv->handle, GSMD_EVT_OUT_STATUS, gsmd_eventhandler);
+  lgsm_evt_handler_register (priv->handle, GSMD_EVT_PIN, gsmd_eventhandler);
   lgsm_register_handler (priv->handle, GSMD_MSG_NETWORK, &net_msghandler);
   lgsm_register_handler (priv->handle, GSMD_MSG_PHONEBOOK, &pb_msghandler);
 
   /* Power the gsm modem up */
-  if (lgsm_phone_power (priv->handle, 1) == -1) {
+  if (lgsm_phone_power (priv->handle, 1) < 0) {
     g_warning ("Error powering up gsm modem");
     lgsm_exit (priv->handle);
     priv->handle = NULL;