r3454 - in trunk/src/target/OM-2007.2/libraries/libmokogsmd2: . libmokogsmd

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-11-20 18:19:24 +0100 (Tue, 20 Nov 2007)
New Revision: 3454

Modified:
   trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog
   trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.c
Log:
* libmokogsmd/moko-gsmd-connection.c:
(moko_gsmd_connection_dispose): Check validity of source and gsm handle
before trying to disconnect from them


Modified: trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog	2007-11-20 14:00:44 UTC (rev 3453)
+++ trunk/src/target/OM-2007.2/libraries/libmokogsmd2/ChangeLog	2007-11-20 17:19:24 UTC (rev 3454)
@@ -1,3 +1,9 @@
+2007-11-20  Thomas Wood  <thomas at openedhand.com>
+
+	* libmokogsmd/moko-gsmd-connection.c:
+	(moko_gsmd_connection_dispose): Check validity of source and gsm handle
+	before trying to disconnect from them
+
 2007-11-08	Michael Lauer	<mickey at openmoko.org>
 
 	* libmokogsmd/moko-gsmd-connection.c: (moko_gsmd_connection_set_antenna_power):

Modified: trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.c
===================================================================
--- trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.c	2007-11-20 14:00:44 UTC (rev 3453)
+++ trunk/src/target/OM-2007.2/libraries/libmokogsmd2/libmokogsmd/moko-gsmd-connection.c	2007-11-20 17:19:24 UTC (rev 3454)
@@ -114,9 +114,12 @@
 
     priv = GSMD_CONNECTION_GET_PRIVATE( MOKO_GSMD_CONNECTION( object ) );
 
-    g_source_destroy( (GSource*) priv->source );
-    lgsm_exit( priv->handle );
+    if (priv->source)
+      g_source_destroy( (GSource*) priv->source );
 
+    if (priv->handle)
+      lgsm_exit( priv->handle );
+
     /* call parent destructor */
     if (G_OBJECT_CLASS (moko_gsmd_connection_parent_class)->dispose)
         G_OBJECT_CLASS (moko_gsmd_connection_parent_class)->dispose (object);