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

[njp at sita.openmoko.org]

Author: njp
Date: 2007-08-22 17:02:15 +0200 (Wed, 22 Aug 2007)
New Revision: 2784

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

	* src/moko-dialer.c: (on_talking_accept_call):
	Fix ordering here as well.

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-08-22 14:56:52 UTC (rev 2783)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-08-22 15:02:15 UTC (rev 2784)
@@ -1,5 +1,10 @@
 2007-08-22  Neil J. Patel  <njp at o-hand.com>
 
+	* src/moko-dialer.c: (on_talking_accept_call):
+	Fix ordering here as well.
+
+2007-08-22  Neil J. Patel  <njp at o-hand.com>
+
 	* src/moko-dialer.c: (on_talking_reject_call),
 	(on_talking_cancel_call), (on_talking_silence):
 	Make sure function ordering is correct so multiple tabs do not open.

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-22 14:56:52 UTC (rev 2783)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c	2007-08-22 15:02:15 UTC (rev 2784)
@@ -316,6 +316,9 @@
   
   if (priv->status != DIALER_STATUS_INCOMING)
     return;
+
+  moko_talking_accepted_call (MOKO_TALKING (priv->talking), NULL, NULL);
+  moko_gsmd_connection_voice_accept (priv->connection);
   
   priv->status = DIALER_STATUS_TALKING;
 
@@ -332,9 +335,6 @@
     priv->time = NULL;
   }  
   
-  moko_talking_accepted_call (MOKO_TALKING (priv->talking), NULL, NULL);
-  moko_gsmd_connection_voice_accept (priv->connection);
-
   g_signal_emit (G_OBJECT (dialer), dialer_signals[TALKING], 0);
 }