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

njp at sita.openmoko.org njp at sita.openmoko.org
Fri Aug 3 15:01:51 CEST 2007


Author: njp
Date: 2007-08-03 15:01:49 +0200 (Fri, 03 Aug 2007)
New Revision: 2620

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

	* src/moko-contacts.c: (moko_contacts_lookup):
	Check entry is valid before performing operations on it.

	* src/moko-dialer.c: (on_incoming_clip), (moko_dialer_dispose):
	Make sure to write to the journal on dispose.

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-08-03 11:54:21 UTC (rev 2619)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-08-03 13:01:49 UTC (rev 2620)
@@ -1,5 +1,13 @@
 2007-08-03  Neil J. Patel  <njp at o-hand.com>
 
+	* src/moko-contacts.c: (moko_contacts_lookup):
+	Check entry is valid before performing operations on it.
+
+	* src/moko-dialer.c: (on_incoming_clip), (moko_dialer_dispose):
+	Make sure to write to the journal on dispose.
+
+2007-08-03  Neil J. Patel  <njp at o-hand.com>
+
 	* src/moko-dialer.c: (on_keypad_dial_clicked),
 	(on_talking_accept_call), (on_talking_reject_call),
 	(on_incoming_call), (on_incoming_clip), (on_call_progress_changed):

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-contacts.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-contacts.c	2007-08-03 11:54:21 UTC (rev 2619)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-contacts.c	2007-08-03 13:01:49 UTC (rev 2620)
@@ -89,7 +89,7 @@
   
   entry =  g_hash_table_lookup (priv->prefixes, number);
 
-  if (!GDK_IS_PIXBUF (entry->contact->photo))
+  if (entry && !GDK_IS_PIXBUF (entry->contact->photo))
     moko_contacts_get_photo (contacts, entry->contact);
 
   return 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-03 11:54:21 UTC (rev 2619)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c	2007-08-03 13:01:49 UTC (rev 2620)
@@ -448,7 +448,7 @@
   last = g_strdup (number);
   timestamp = GDK_CURRENT_TIME;
   
-  entry = moko_contacts_lookup (priv->contacts, number);
+  entry = moko_contacts_lookup (moko_contacts_get_default (), number);
   moko_talking_set_clip (MOKO_TALKING (priv->talking), number, entry);
 
   /* Add the info to the journal entry */
@@ -581,6 +581,7 @@
   priv = dialer->priv;
 
   /* Close journal */
+  moko_journal_write_to_storage (priv->journal);
   moko_journal_close (priv->journal);
 
   /* Free contacts list */





More information about the commitlog mailing list