r3490 - in trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src/phone-kit

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-11-23 14:00:36 +0100 (Fri, 23 Nov 2007)
New Revision: 3490

Modified:
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
   trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
Log:
* src/phone-kit/moko-talking.c: (moko_talking_set_clip),
(incoming_timeout), (moko_talking_incoming_call),
(outgoing_timeout), (moko_talking_outgoing_call),
(on_pad_user_input), (moko_talking_init):

Reset "talking" UI on new call


Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-11-23 11:36:29 UTC (rev 3489)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog	2007-11-23 13:00:36 UTC (rev 3490)
@@ -1,5 +1,14 @@
 2007-11-23  Thomas Wood  <thomas at openedhand.com>
 
+	* src/phone-kit/moko-talking.c: (moko_talking_set_clip),
+	(incoming_timeout), (moko_talking_incoming_call),
+	(outgoing_timeout), (moko_talking_outgoing_call),
+	(on_pad_user_input), (moko_talking_init):
+
+	Reset "talking" UI on new call
+
+2007-11-23  Thomas Wood  <thomas at openedhand.com>
+
 	* src/phone-kit/moko-dialer.c: (on_pin_requested): Send registration
 	request one second after sending pin
 

Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c	2007-11-23 11:36:29 UTC (rev 3489)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c	2007-11-23 13:00:36 UTC (rev 3490)
@@ -45,6 +45,7 @@
   MokoJournal *journal;
 
   GtkWidget *window;
+  GtkWidget *notebook;
 
   GtkWidget *incoming_bar;
   GtkWidget *main_bar;
@@ -56,6 +57,8 @@
   GtkWidget *person;
   GtkWidget *status;
   
+  GtkToolItem *speaker_toggle_btn;
+  
   GtkWidget *dtmf_display;
   GtkWidget *dtmf_pad;
 
@@ -113,6 +116,17 @@
   g_free (markup);
 }
 
+static void
+moko_talking_reset_ui (MokoTalking *talking)
+{
+  MokoTalkingPrivate *priv;
+  priv = MOKO_TALKING_GET_PRIVATE (talking);
+  gtk_toggle_tool_button_set_active (
+                      GTK_TOGGLE_TOOL_BUTTON (priv->speaker_toggle_btn), FALSE);
+  moko_dialer_textview_empty (MOKO_DIALER_TEXTVIEW (priv->dtmf_display));
+  gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), 0);
+}
+
 static gboolean
 incoming_timeout (MokoTalking *talking)
 {
@@ -138,6 +152,8 @@
                             MokoContactEntry *entry)
 {
   MokoTalkingPrivate *priv;
+  
+  moko_talking_reset_ui (talking);
 
   g_return_if_fail (MOKO_IS_TALKING (talking));
   priv = talking->priv;
@@ -191,6 +207,8 @@
 
   g_return_if_fail (MOKO_IS_TALKING (talking));
   priv = talking->priv;
+  
+  moko_talking_reset_ui (talking);
 
   gtk_widget_hide (priv->incoming_bar);
   gtk_widget_show_all (priv->main_bar);
@@ -220,6 +238,7 @@
 
   g_free (markup);
   priv->call_direction = CALL_DIRECTION_OUTGOING;
+  
   gtk_window_present (GTK_WINDOW (priv->window));
 }
 
@@ -467,6 +486,7 @@
 
   notebook = gtk_notebook_new ();
   gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook), GTK_POS_BOTTOM);
+  priv->notebook = notebook;
 
   /* status page */
   main_vbox = gtk_vbox_new (FALSE, 0);
@@ -505,6 +525,7 @@
   gtk_tool_item_set_expand (item, TRUE);
   g_signal_connect (item, "toggled", G_CALLBACK (on_speaker_toggled), talking);
   gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, 0);
+  priv->speaker_toggle_btn = item;
 
   gtk_toolbar_insert (GTK_TOOLBAR (toolbar), gtk_separator_tool_item_new (), 1);