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

[chris at sita.openmoko.org]

Author: chris
Date: 2008-02-01 11:11:24 +0100 (Fri, 01 Feb 2008)
New Revision: 4008

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-network.c
Log:
        * src/phone-kit/moko-network.c: (io_func):
        Handle all IO conditions, bail on unknown conditions (noticed problems
        when doing otherwise)


Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2008-02-01 01:14:17 UTC (rev 4007)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2008-02-01 10:11:24 UTC (rev 4008)
@@ -1,3 +1,9 @@
+2008-02-01  Chris Lord  <chris at openedhand.com>
+
+	* src/phone-kit/moko-network.c: (io_func):
+	Handle all IO conditions, bail on unknown conditions (noticed problems
+	when doing otherwise)
+
 2008-01-31  Chris Lord  <chris at openedhand.com>
 
 	* src/phone-kit/moko-network.c: (stop_retrying_registration),

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-network.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-network.c	2008-02-01 01:14:17 UTC (rev 4007)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-network.c	2008-02-01 10:11:24 UTC (rev 4008)
@@ -784,6 +784,7 @@
   GError *error = NULL;
   
   switch (condition) {
+    case G_IO_PRI :
     case G_IO_IN :
       if (g_io_channel_read_chars (source, buf, sizeof (buf), &length, &error)
           == G_IO_STATUS_NORMAL) {
@@ -802,10 +803,13 @@
     case G_IO_HUP :
       g_warning ("Gsmd hung up - TODO: Reconnect/restart gsmd?");
       return FALSE;
+    
+    case G_IO_OUT :
+      break;
 
     default :
-      g_warning ("Unhandled IO condition");
-      break;
+      g_warning ("Unhandled IO condition, bailing");
+      return FALSE;
   }
 
   return TRUE;