r2056 - in trunk/src/target/OM-2007/openmoko-libs: . libmokogsmd
thomas at sita.openmoko.org
thomas at sita.openmoko.org
Tue May 22 11:26:11 CEST 2007
Author: thomas
Date: 2007-05-22 11:26:10 +0200 (Tue, 22 May 2007)
New Revision: 2056
Modified:
trunk/src/target/OM-2007/openmoko-libs/ChangeLog
trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.c
Log:
* libmokogsmd/moko-gsmd-connection.c:
(_moko_gsmd_connection_source_dispatch): Prevent the mainloop from
locking up if gsmd goes away
Modified: trunk/src/target/OM-2007/openmoko-libs/ChangeLog
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-05-22 08:44:36 UTC (rev 2055)
+++ trunk/src/target/OM-2007/openmoko-libs/ChangeLog 2007-05-22 09:26:10 UTC (rev 2056)
@@ -1,3 +1,9 @@
+2007-05-22 Thomas Wood <thomas at openedhand.com>
+
+ * libmokogsmd/moko-gsmd-connection.c:
+ (_moko_gsmd_connection_source_dispatch): Prevent the mainloop from
+ locking up if gsmd goes away
+
2007-05-18 Thomas Wood <thomas at openedhand.com>
* libmokoui/moko-pixmap-button.c:
Modified: trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.c
===================================================================
--- trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.c 2007-05-22 08:44:36 UTC (rev 2055)
+++ trunk/src/target/OM-2007/openmoko-libs/libmokogsmd/moko-gsmd-connection.c 2007-05-22 09:26:10 UTC (rev 2056)
@@ -240,7 +240,12 @@
if ( size < 0 )
g_warning( "moko_gsmd_connection_source_dispatch: read error from libgsmd: %s", strerror( errno ) );
else
+ {
+ if ( size == 0 ) /* EOF */
+ return FALSE;
+
lgsm_handle_packet( self->handle, buf, size );
+ }
return TRUE;
}
More information about the commitlog
mailing list