r2824 - in trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src

[njp at sita.openmoko.org]

Author: njp
Date: 2007-08-23 19:12:44 +0200 (Thu, 23 Aug 2007)
New Revision: 2824

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
Log:
2007-08-23  Neil J. Patel  <njp at o-hand.com>

	* src/moko-dialer.c: (on_talking_accept_call),
	(on_talking_reject_call), (on_call_progress_changed):
	Fixes journal crash on incoming calls.

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-08-23 17:02:15 UTC (rev 2823)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-08-23 17:12:44 UTC (rev 2824)
@@ -1,5 +1,11 @@
 2007-08-23  Neil J. Patel  <njp at o-hand.com>
 
+	* src/moko-dialer.c: (on_talking_accept_call),
+	(on_talking_reject_call), (on_call_progress_changed):
+	Fixes journal crash on incoming calls.
+
+2007-08-23  Neil J. Patel  <njp at o-hand.com>
+
 	* src/moko-dialer.c: (on_keypad_dial_clicked),
 	(on_talking_accept_call):
 	Stop crashing on second outgoing call.

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c	2007-08-23 17:02:15 UTC (rev 2823)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c	2007-08-23 17:12:44 UTC (rev 2824)
@@ -323,8 +323,6 @@
   {
     moko_journal_add_entry (priv->journal, priv->entry);
     moko_journal_write_to_storage (priv->journal);
-    if (priv->time) 
-      moko_time_free (priv->time);
     priv->entry = NULL;
     priv->time = NULL;
   }  
@@ -349,9 +347,8 @@
   /* Finalise and add the journal entry */
   if (priv->entry)
   {
+    moko_journal_voice_info_set_was_missed (priv->entry, TRUE);
     moko_journal_add_entry (priv->journal, priv->entry);
-    if (priv->time) 
-      moko_time_free (priv->time);
     priv->entry = NULL;
     priv->time = NULL;
   }
@@ -575,8 +572,6 @@
 
         moko_journal_add_entry (priv->journal, priv->entry);
         moko_journal_write_to_storage (priv->journal);
-        if (priv->time)
-          moko_time_free (priv->time);
         priv->entry = NULL;
         priv->time = NULL;
       }