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

[chris at sita.openmoko.org]

Author: chris
Date: 2007-11-21 14:18:47 +0100 (Wed, 21 Nov 2007)
New Revision: 3463

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-sms.c
Log:
        * src/phone-kit/moko-dialer-sms.c: (moko_dialer_sms_finalize),
        (store_sms), (moko_dialer_sms_send):
        Fix compiler warnings, check the source exists before trying to
        destroy it on finalize


Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-11-20 18:35:34 UTC (rev 3462)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-11-21 13:18:47 UTC (rev 3463)
@@ -1,3 +1,10 @@
+2007-11-21  Chris Lord  <chris at openedhand.com>
+
+	* src/phone-kit/moko-dialer-sms.c: (moko_dialer_sms_finalize),
+	(store_sms), (moko_dialer_sms_send):
+	Fix compiler warnings, check the source exists before trying to 
+	destroy it on finalize
+
 2007-11-20  Chris Lord  <chris at openedhand.com>
 
 	* src/phone-kit/moko-dialer-sms.c: (moko_dialer_sms_class_init):

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer-sms.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer-sms.c	2007-11-20 18:35:34 UTC (rev 3462)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer-sms.c	2007-11-21 13:18:47 UTC (rev 3463)
@@ -66,7 +66,7 @@
 {
 	MokoDialerSMSPrivate *priv = SMS_PRIVATE (object);
 	
-	g_source_destroy ((GSource *)priv->source);
+	if (priv->source) g_source_destroy ((GSource *)priv->source);
 	g_free (priv->own_number);
 	lgsm_exit (priv->handle);
 
@@ -158,7 +158,7 @@
 	/* Store message in the journal */
 	if (message) {
 		struct lgsm_sms_delete sms_del;
-		gchar *author, *recipient;
+		gchar *author;
 		JanaNote *note = jana_ecal_note_new ();
 		
 		g_debug ("Moving message to journal:\n\"%s\"", message);
@@ -442,7 +442,6 @@
 	gint msg_length, c;
 	gboolean ascii;
 	JanaNote *note;
-	gchar *author;
 	
 	g_assert (self && number && message);