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

[njp at sita.openmoko.org]

Author: njp
Date: 2007-08-23 17:50:14 +0200 (Thu, 23 Aug 2007)
New Revision: 2819

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_incoming_call):
	Make sure we don't do anything on an incmong call if we have already
	accepted it.

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-08-23 15:40:44 UTC (rev 2818)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-08-23 15:50:14 UTC (rev 2819)
@@ -1,5 +1,11 @@
 2007-08-23  Neil J. Patel  <njp at o-hand.com>
 
+	* src/moko-dialer.c: (on_talking_accept_call), (on_incoming_call):
+	Make sure we don't do anything on an incmong call if we have already
+	accepted it.
+
+2007-08-23  Neil J. Patel  <njp at o-hand.com>
+
 	* src/moko-notify.c: (on_sound_finished),
 	(moko_notify_start_ringtone):
 	Remove debugging printf's as everything works!

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 15:40:44 UTC (rev 2818)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c	2007-08-23 15:50:14 UTC (rev 2819)
@@ -318,7 +318,6 @@
     return;
 
   moko_gsmd_connection_voice_accept (priv->connection);
-  
   priv->status = DIALER_STATUS_TALKING;
 
   /* Stop the notification */
@@ -465,7 +464,8 @@
   priv = dialer->priv;
 
   /* We sometimes get the signals multiple times */
-  if (priv->status == DIALER_STATUS_INCOMING)
+  if (priv->status == DIALER_STATUS_INCOMING  
+        || priv->status == DIALER_STATUS_TALKING)
   {
     /*g_print ("We are already showing the incoming page\n");*/
     return;