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

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-11-28 10:19:55 +0100 (Wed, 28 Nov 2007)
New Revision: 3524

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): Connect gsmd handlers
before setting 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 02:01:01 UTC (rev 3523)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-11-28 09:19:55 UTC (rev 3524)
@@ -1,3 +1,8 @@
+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
+
 2007-11-27  Thomas Wood  <thomas at openedhand.com>
 
 	* src/phone-kit/moko-dialer.c: (pb_msghandler):

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 02:01:01 UTC (rev 3523)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c	2007-11-28 09:19:55 UTC (rev 3524)
@@ -1109,15 +1109,7 @@
     g_warning ("Error connecting to gsmd");
     return;
   }
-  
-  /* Power the gsm modem up */
-  if (lgsm_phone_power (priv->handle, 1) == -1) {
-    g_warning ("Error powering up gsm modem");
-    lgsm_exit (priv->handle);
-    priv->handle = NULL;
-    return;
-  }
-  
+
   /* Add event handlers */
   lgsm_evt_handler_register (priv->handle, GSMD_EVT_IN_CALL, gsmd_eventhandler);
   lgsm_evt_handler_register (priv->handle, GSMD_EVT_IN_CLIP, gsmd_eventhandler);
@@ -1128,6 +1120,14 @@
   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) {
+    g_warning ("Error powering up gsm modem");
+    lgsm_exit (priv->handle);
+    priv->handle = NULL;
+    return;
+  }
+
   /* Register with network */
   priv->registered = GSMD_NETREG_UNREG;
   lgsm_netreg_register (priv->handle, "");