r1971 - trunk/src/target/OM-2007/applications/openmoko-dialer/src

[thomas at sita.openmoko.org]

Author: thomas
Date: 2007-05-16 17:53:15 +0200 (Wed, 16 May 2007)
New Revision: 1971

Modified:
   trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.c
   trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-talking.c
Log:
openmoko-dialer: make sure window-talking is initialised, and hangup when it is hidden


Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.c	2007-05-16 15:46:56 UTC (rev 1970)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-incoming.c	2007-05-16 15:53:15 UTC (rev 1971)
@@ -228,6 +228,8 @@
   {
     moko_gsmd_connection_voice_accept (data->connection);
     /* dialer_window_talking_show (data); */
+    if (!data->window_talking)
+      window_talking_init ();
     gtk_widget_show_all (data->window_talking);
   }
   else

Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-talking.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-talking.c	2007-05-16 15:46:56 UTC (rev 1970)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/dialer-window-talking.c	2007-05-16 15:53:15 UTC (rev 1971)
@@ -218,6 +218,10 @@
   gtk_widget_hide (appdata->toolbox_talking);
 
   moko_dialer_textview_empty (appdata->moko_dtmf_text_view);
+
+  /* talking window has been hidden, so we should probably make sure the... */
+  moko_gsmd_connection_voice_hangup (data->connection);
+
 /*  add_histroy_entry (appdata, appdata->g_state.historytype,
                      appdata->g_peer_info.name,
                      appdata->g_peer_info.number,
@@ -367,12 +371,6 @@
                       G_CALLBACK (on_window_talking_hide), p_dialer_data);
 
 
-    //now the wheel and tool box, why should the wheel and toolbox created after the gtk_widget_show_all???
-    //please refer to bug 175.
-    //FIXME:Dear Thomas, please modify the libmokoui before deleting the show_all & hide codes. I don't want to splash
-    //any window either, but for now, it's the most convenient way to debug the application. We will remove it, but later, OK?
-    //Tony Guan 14/3/2007
-    gtk_widget_show_all (GTK_WIDGET (window));
     gtk_widget_hide (content_dtmf);     //And this line is necessary because dtmf interface & talking interface share the same window.
     //we have to hide it first.
     wheel = moko_finger_window_get_wheel (window);