summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2012-02-16 16:56:22 -0500
committerOlivier CrĂȘte <olivier.crete@collabora.com>2012-02-16 16:56:22 -0500
commit6953bb5278425cc4e4ff0075052f3c53b59879e8 (patch)
tree497ce762ed5df4a5033e8659f8f6eaccce94b74a
parent790547386bc0aa39f8135dfb742230ce55f86249 (diff)
downloadtelepathy-glib-6953bb5278425cc4e4ff0075052f3c53b59879e8.tar.gz
MediaCallContent: Don't drop tone currently_sending before it's done playing
-rw-r--r--telepathy-glib/base-media-call-content.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/telepathy-glib/base-media-call-content.c b/telepathy-glib/base-media-call-content.c
index b0f0c9ef4..6aa5ecfc5 100644
--- a/telepathy-glib/base-media-call-content.c
+++ b/telepathy-glib/base-media-call-content.c
@@ -804,6 +804,10 @@ tp_base_media_call_content_acknowledge_dtmf_change (
if (in_State == TP_SENDING_STATE_SENDING)
tp_svc_call_content_interface_dtmf_emit_sending_tones (self,
self->priv->currently_sending_tones);
+ else if (in_State == TP_SENDING_STATE_NONE &&
+ self->priv->currently_sending_tones &&
+ self->priv->currently_sending_tones[0])
+ self->priv->currently_sending_tones++;
self->priv->current_dtmf_state = in_State;
@@ -1133,8 +1137,6 @@ tp_base_media_call_content_dtmf_next (TpBaseMediaCallContent *self)
default:
g_assert_not_reached ();
}
-
- self->priv->currently_sending_tones++;
}
else
{