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

[njp at sita.openmoko.org]

Author: njp
Date: 2007-08-22 16:56:52 +0200 (Wed, 22 Aug 2007)
New Revision: 2783

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_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/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-08-22 14:44:32 UTC (rev 2782)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-08-22 14:56:52 UTC (rev 2783)
@@ -1,5 +1,11 @@
 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.
+
+2007-08-22  Neil J. Patel  <njp at o-hand.com>
+
 	* src/moko-dialer.c: (on_network_registered):
 	Correctly format output.
 

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:44:32 UTC (rev 2782)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/moko-dialer.c	2007-08-22 14:56:52 UTC (rev 2783)
@@ -347,8 +347,11 @@
   g_return_if_fail (MOKO_IS_DIALER (dialer));
   priv = dialer->priv;
 
+  moko_gsmd_connection_voice_hangup (priv->connection);
   priv->status = DIALER_STATUS_NORMAL;
-
+  
+  gtk_notebook_remove_page (GTK_NOTEBOOK (priv->notebook), 0);
+ 
   /* Finalise and add the journal entry */
   if (priv->entry)
   {
@@ -359,9 +362,6 @@
     priv->time = NULL;
   }
 
-  gtk_notebook_remove_page (GTK_NOTEBOOK (priv->notebook), 0);
-  moko_gsmd_connection_voice_hangup (priv->connection);
-
   g_signal_emit (G_OBJECT (dialer), dialer_signals[REJECTED], 0);
   moko_keypad_set_talking (MOKO_KEYPAD (priv->keypad), FALSE);
 }
@@ -373,12 +373,12 @@
 
   g_return_if_fail (MOKO_IS_DIALER (dialer));
   priv = dialer->priv;
-
+  
+  moko_gsmd_connection_voice_hangup (priv->connection);
+  
   priv->status = DIALER_STATUS_NORMAL;
-
   gtk_notebook_remove_page (GTK_NOTEBOOK (priv->notebook), 0);
-  moko_gsmd_connection_voice_hangup (priv->connection);
-
+  
   g_signal_emit (G_OBJECT (dialer), dialer_signals[HUNG_UP], 0);
   moko_keypad_set_talking (MOKO_KEYPAD (priv->keypad), FALSE);
 }
@@ -391,8 +391,6 @@
   g_return_if_fail (MOKO_IS_DIALER (dialer));
   priv = dialer->priv;
 
-  priv->status = DIALER_STATUS_NORMAL;
-
   moko_notify_stop (priv->notify);
 }