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

njp at sita.openmoko.org njp at sita.openmoko.org
Mon Aug 13 12:12:00 CEST 2007


Author: njp
Date: 2007-08-13 12:11:58 +0200 (Mon, 13 Aug 2007)
New Revision: 2692

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-13  Neil J. Patel  <njp at o-hand.com>

	* src/moko-dialer.c: (on_keypad_dial_clicked),
	(on_talking_accept_call), (on_incoming_call), (on_incoming_clip),
	(on_call_progress_changed), (moko_dialer_dispose),
	(moko_dialer_init):
	Check if moko_journal_load_from_storage () worked, otherwise don't create
	journal objects.

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-08-10 17:04:14 UTC (rev 2691)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-08-13 10:11:58 UTC (rev 2692)
@@ -1,3 +1,12 @@
+2007-08-13  Neil J. Patel  <njp at o-hand.com>
+
+	* src/moko-dialer.c: (on_keypad_dial_clicked),
+	(on_talking_accept_call), (on_incoming_call), (on_incoming_clip),
+	(on_call_progress_changed), (moko_dialer_dispose),
+	(moko_dialer_init):
+	Check if moko_journal_load_from_storage () worked, otherwise don't create
+	journal objects.
+
 2007-08-10  Neil J. Patel  <njp at o-hand.com>
 
 	* src/moko-dialer.c: (on_keypad_pin_entry),

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-10 17:04:14 UTC (rev 2691)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c	2007-08-13 10:11:58 UTC (rev 2692)
@@ -241,20 +241,22 @@
   entry = moko_contacts_lookup (moko_contacts_get_default (), number);
 
   /* Prepare a voice journal entry */
-  priv->entry = moko_journal_entry_new (VOICE_JOURNAL_ENTRY);
-  priv->time = moko_time_new_today ();
-  moko_journal_entry_set_direction (priv->entry, DIRECTION_IN);
-  moko_journal_entry_set_dtstart (priv->entry, priv->time);
-  moko_journal_entry_set_source (priv->entry, "Openmoko Dialer");
-  moko_journal_voice_info_set_distant_number (priv->entry, number);
-  if (entry)
-    moko_journal_entry_set_contact_uid (priv->entry, entry->contact->uid);
-  moko_journal_add_entry (priv->journal, priv->entry);
-  moko_journal_write_to_storage (priv->journal);
-  moko_time_free (priv->time);
-  priv->entry = NULL;
-  priv->time = NULL;
-
+  if (priv->journal)
+  {
+    priv->entry = moko_journal_entry_new (VOICE_JOURNAL_ENTRY);
+    priv->time = moko_time_new_today ();
+    moko_journal_entry_set_direction (priv->entry, DIRECTION_IN);
+    moko_journal_entry_set_dtstart (priv->entry, priv->time);
+    moko_journal_entry_set_source (priv->entry, "Openmoko Dialer");
+    moko_journal_voice_info_set_distant_number (priv->entry, number);
+    if (entry)
+      moko_journal_entry_set_contact_uid (priv->entry, entry->contact->uid);
+    moko_journal_add_entry (priv->journal, priv->entry);
+    moko_journal_write_to_storage (priv->journal);
+    moko_time_free (priv->time);
+    priv->entry = NULL;
+    priv->time = NULL;
+  }
   moko_talking_outgoing_call (MOKO_TALKING (priv->talking), number, entry);
 
   gtk_notebook_insert_page (GTK_NOTEBOOK (priv->notebook), priv->talking,
@@ -308,7 +310,7 @@
   moko_notify_stop (priv->notify);  
   
   /* Finalise and add the journal entry */
-  if (priv->entry)
+  if (priv->journal && priv->entry)
   {
     moko_journal_add_entry (priv->journal, priv->entry);
     if (priv->time) 
@@ -427,12 +429,14 @@
   priv->status = DIALER_STATUS_INCOMING;
 
   /* Prepare a voice journal entry */
-  priv->entry = moko_journal_entry_new (VOICE_JOURNAL_ENTRY);
-  priv->time = moko_time_new_today ();
-  moko_journal_entry_set_direction (priv->entry, DIRECTION_IN);
-  moko_journal_entry_set_dtstart (priv->entry, priv->time);
-  moko_journal_entry_set_source (priv->entry, "Openmoko Dialer");
-
+  if (priv->journal)
+  {
+    priv->entry = moko_journal_entry_new (VOICE_JOURNAL_ENTRY);
+    priv->time = moko_time_new_today ();
+    moko_journal_entry_set_direction (priv->entry, DIRECTION_IN);
+    moko_journal_entry_set_dtstart (priv->entry, priv->time);
+    moko_journal_entry_set_source (priv->entry, "Openmoko Dialer");
+  }
   /* Set up the user interface */
   moko_talking_incoming_call (MOKO_TALKING (priv->talking), NULL, NULL);
 
@@ -480,10 +484,12 @@
   moko_talking_set_clip (MOKO_TALKING (priv->talking), number, entry);
 
   /* Add the info to the journal entry */
-  moko_journal_voice_info_set_distant_number (priv->entry, number);
-  if (entry)
-    moko_journal_entry_set_contact_uid (priv->entry, entry->contact->uid);
-
+  if (priv->journal && priv->entry)
+  {
+    moko_journal_voice_info_set_distant_number (priv->entry, number);
+    if (entry)
+      moko_journal_entry_set_contact_uid (priv->entry, entry->contact->uid);
+  }
   g_signal_emit (G_OBJECT (dialer), dialer_signals[INCOMING_CALL], 0, number);
   g_print ("Incoming Number = %s\n", number);
 }
@@ -516,7 +522,7 @@
     case MOKO_GSMD_PROG_RELEASE:
       moko_dialer_hung_up (dialer);
       moko_keypad_set_talking (MOKO_KEYPAD (priv->keypad), FALSE);
-      if (priv->entry)
+      if (priv->journal && priv->entry)
       {
         moko_journal_entry_get_direction (priv->entry, &dir);
         if (dir == DIRECTION_IN)
@@ -610,8 +616,11 @@
   priv = dialer->priv;
 
   /* Close journal */
-  moko_journal_write_to_storage (priv->journal);
-  moko_journal_close (priv->journal);
+  if (priv->journal)
+  {
+    moko_journal_write_to_storage (priv->journal);
+    moko_journal_close (priv->journal);
+  }
 
   /* Free contacts list */
   //contact_release_contact_list (&(priv->data->g_contactlist));
@@ -728,7 +737,8 @@
 
   /* Set up the journal */
   priv->journal = moko_journal_open_default ();
-  moko_journal_load_from_storage (priv->journal);
+  if (!moko_journal_load_from_storage (priv->journal))
+    priv->journal = NULL;
 
   /* Load the contacts store */
   priv->contacts = moko_contacts_get_default ();





More information about the commitlog mailing list