r1298 - trunk/src/target/OM-2007/applications/openmoko-dialer/src
tony_guan at sita.openmoko.org
tony_guan at sita.openmoko.org
Fri Mar 9 04:38:19 CET 2007
Author: tony_guan
Date: 2007-03-09 04:38:11 +0100 (Fri, 09 Mar 2007)
New Revision: 1298
Modified:
trunk/src/target/OM-2007/applications/openmoko-dialer/src/event.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c
trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c
Log:
gsmd got the incoming status OK, so the previous timeout mechanism is no more needed. the incoming disconnect can be detected immediately now.
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/event.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/event.c 2007-03-09 03:17:58 UTC (rev 1297)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/event.c 2007-03-09 03:38:11 UTC (rev 1298)
@@ -219,7 +219,7 @@
if (aux->u.call_status.prog == GSMD_CALLPROG_DISCONNECT)
{
- if (aux->u.call_status.dir == GSMD_CALL_DIR_MO)
+// if (aux->u.call_status.dir == GSMD_CALL_DIR_MO)
gsm_peer_disconnect ();
}
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c 2007-03-09 03:17:58 UTC (rev 1297)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-main.c 2007-03-09 03:38:11 UTC (rev 1298)
@@ -158,6 +158,7 @@
gsm_hangup();
if(appdata->window_talking)gtk_widget_hide(appdata->window_talking);
if(appdata->window_outgoing)gtk_widget_hide(appdata->window_outgoing);
+ if(appdata->window_incoming)gtk_widget_hide(appdata->window_incoming);
}
Modified: trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c 2007-03-09 03:17:58 UTC (rev 1297)
+++ trunk/src/target/OM-2007/applications/openmoko-dialer/src/openmoko-dialer-window-incoming.c 2007-03-09 03:38:11 UTC (rev 1298)
@@ -126,19 +126,9 @@
//DBG_ENTER();
TIMER_DATA *timer_data = &(appdata->g_timer_data);
-/*
-timer_data->ticks++;
-timer_data->hour=timer_data->ticks/3600;
-timer_data->min=(timer_data->ticks-timer_data->hour*3600)/60;
-timer_data->sec=timer_data->ticks%60;
-
-
-sprintf(timer_data->timestring,"%02d:%02d:%02d",timer_data->hour,timer_data->min,timer_data->sec);
-//ok,we update the label now.
-moko_dialer_status_set_status_label(appdata->status_incoming,timer_data->timestring);
-*/
moko_dialer_status_update_icon(appdata->status_incoming);
-
+//now that we have the incoming call status report correctly, the timeout mechanism is not needed.
+/*
if (event_get_keep_calling ())
{
event_reset_keep_calling ();
@@ -163,7 +153,7 @@
timer_data->ticks++;
}
}
-
+*/
return 1;
More information about the commitlog
mailing list