r4252 - in trunk/src/target/OM-2007.2/applications/openmoko-dialer2: . src/phone-kit
erin_yueh at sita.openmoko.org
erin_yueh at sita.openmoko.org
Wed Mar 26 10:29:20 CET 2008
Author: erin_yueh
Date: 2008-03-26 10:29:15 +0100 (Wed, 26 Mar 2008)
New Revision: 4252
Modified:
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c
Log:
openmoko-dialer2: unable to terminate call (bug#1239)
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog 2008-03-26 00:49:00 UTC (rev 4251)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/ChangeLog 2008-03-26 09:29:15 UTC (rev 4252)
@@ -1,3 +1,15 @@
+2008-03-26 Erin Yueh <erin_yueh at openmoko.com>
+
+ * src/phone-kit/moko-dialer.c: (moko_dialer_hung_up),
+ (moko_dialer_rejected), (on_call_progress):
+
+ * src/phone-kit/moko-talking.c: (moko_talking_incoming_call),
+ (moko_talking_outgoing_call), (on_reject_clicked),
+ (on_cancel_clicked), (window_delete_event_cb):
+
+ bug#1239: unable to terminate call
+
+
2008-03-26 Thomas Wood <thomas at openedhand.com>
* src/dialer/moko-history.c: (create_new_contact_from_number),
@@ -29,6 +41,10 @@
* src/dialer/moko-history.c: Add a "Save" button to the call log window
+2008-03-12 Erin Yueh <erin_yueh at openmoko.com>
+
+ * src/phone-kit/moko-talking.c: bug fixed for Call Direction
+
2008-03-07 Chia-I Wu <olv at openmoko.com>
* src/common/moko-contacts.c (moko_contacts_init): Create addressbook
@@ -66,6 +82,11 @@
* src/phone-kit/moko-sms.c, src/phone-kit/Makefile.am: Updated.
+2008-03-05 Erin Yueh <erin_yueh at openmoko.com>
+
+ * src/dialer/moko-history.c: (on_sms_clicked):
+ add SMS clicked from call log history
+
2008-03-03 Chris Lord <chris at openedhand.com>
* src/phone-kit/moko-sms.c: (on_incoming_sms):
Modified: trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c
===================================================================
--- trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c 2008-03-26 00:49:00 UTC (rev 4251)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-dialer.c 2008-03-26 09:29:15 UTC (rev 4252)
@@ -282,15 +282,20 @@
g_return_if_fail (MOKO_IS_DIALER (dialer));
priv = dialer->priv;
+ g_warning("moko_dialer_hung_up");
if (!moko_network_get_lgsm_handle (priv->network, &handle, NULL))
return;
-
if (priv->status != PK_DIALER_NORMAL) {
priv->status = PK_DIALER_NORMAL;
g_signal_emit (G_OBJECT (dialer), dialer_signals[STATUS_CHANGED], 0,
priv->status);
}
+ /* Send ATH to hang up the call from gsmd */
lgsm_voice_hangup (handle);
+ /* Stop the notification */
+ moko_notify_stop (priv->notify);
+ moko_talking_hide_window (MOKO_TALKING (priv->talking));
+
g_signal_emit (G_OBJECT (dialer), dialer_signals[HUNG_UP], 0);
}
@@ -304,20 +309,21 @@
g_return_if_fail (MOKO_IS_DIALER (dialer));
priv = dialer->priv;
+ g_warning("moko_dialer_rejected");
if (!moko_network_get_lgsm_handle (priv->network, &handle, NULL))
return;
-
if (priv->status != PK_DIALER_NORMAL) {
priv->status = PK_DIALER_NORMAL;
g_signal_emit (G_OBJECT (dialer), dialer_signals[STATUS_CHANGED], 0,
priv->status);
}
+ /* Send ATH to hang up the call from gsmd */
+ lgsm_voice_hangup (handle);
/* Stop the notification */
moko_notify_stop (priv->notify);
-
- lgsm_voice_hangup (handle);
-
+ moko_talking_hide_window (MOKO_TALKING (priv->talking));
+
g_signal_emit (G_OBJECT (dialer), dialer_signals[REJECTED], 0);
}
@@ -572,6 +578,9 @@
switch (type)
{
case GSMD_CALLPROG_DISCONNECT:
+ g_debug ("mokogsmd disconnect");
+ break;
+
case GSMD_CALLPROG_RELEASE:
/* Finalise and add the journal entry */
if (priv->journal && priv->entry)
@@ -597,14 +606,11 @@
g_free (priv->incoming_clip);
priv->incoming_clip = NULL;
- moko_notify_stop (priv->notify);
- moko_talking_hide_window (MOKO_TALKING (priv->talking));
- g_debug ("mokogsmd disconnect");
+ g_debug ("mokogsmd release");
break;
case GSMD_CALLPROG_REJECT:
moko_dialer_rejected (dialer);
- moko_talking_hide_window (MOKO_TALKING (priv->talking));
g_debug ("mokogsmd reject");
break;
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 2008-03-26 00:49:00 UTC (rev 4251)
+++ trunk/src/target/OM-2007.2/applications/openmoko-dialer2/src/phone-kit/moko-talking.c 2008-03-26 09:29:15 UTC (rev 4252)
@@ -121,6 +121,7 @@
{
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));
@@ -177,6 +178,7 @@
(gpointer)talking);
priv->call_direction = CALL_DIRECTION_INCOMING;
gtk_window_present (GTK_WINDOW (priv->window));
+ gtk_window_deiconify (GTK_WINDOW (priv->window));
}
static gboolean
@@ -206,11 +208,11 @@
MokoTalkingPrivate *priv;
gchar *markup = NULL;
+ moko_talking_reset_ui (talking);
+
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);
@@ -242,6 +244,7 @@
priv->call_direction = CALL_DIRECTION_OUTGOING;
gtk_window_present (GTK_WINDOW (priv->window));
+ gtk_window_deiconify (GTK_WINDOW (priv->window));
}
static gboolean
@@ -355,7 +358,7 @@
on_reject_clicked (GtkToolButton *button, MokoTalking *talking)
{
MokoTalkingPrivate *priv;
-
+ g_warning("on_reject_clicked");
g_return_if_fail (MOKO_IS_TALKING (talking));
priv = talking->priv;
@@ -380,6 +383,7 @@
g_return_if_fail (MOKO_IS_TALKING (talking));
priv = talking->priv;
+ g_warning("on_cancel_clicked");
/* stop call duration timer */
if (priv->dtimer)
g_timer_destroy(priv->dtimer);
@@ -482,6 +486,7 @@
window_delete_event_cb (GtkWidget *widget, GdkEvent *event, MokoTalking *talking)
{
MokoTalkingPrivate *priv = MOKO_TALKING_GET_PRIVATE (talking);
+ g_warning("window_delete_event_cb");
if (priv->call_direction == CALL_DIRECTION_INCOMING)
on_reject_clicked (NULL, talking);
else
More information about the commitlog
mailing list
