aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2011-02-24 00:45:16 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2011-02-24 00:45:16 +0800
commit50c9020cfe7924fcb9bb69599ecede1f396e9bbd (patch)
treee4fde8888d27dd5e2399652fa8780f8837421bbe
parent8b0718b8a650ff1f5d9e4a77011646366e592126 (diff)
downloadgsoc2013-empathy-50c9020cfe7924fcb9bb69599ecede1f396e9bbd.tar
gsoc2013-empathy-50c9020cfe7924fcb9bb69599ecede1f396e9bbd.tar.gz
gsoc2013-empathy-50c9020cfe7924fcb9bb69599ecede1f396e9bbd.tar.bz2
gsoc2013-empathy-50c9020cfe7924fcb9bb69599ecede1f396e9bbd.tar.lz
gsoc2013-empathy-50c9020cfe7924fcb9bb69599ecede1f396e9bbd.tar.xz
gsoc2013-empathy-50c9020cfe7924fcb9bb69599ecede1f396e9bbd.tar.zst
gsoc2013-empathy-50c9020cfe7924fcb9bb69599ecede1f396e9bbd.zip
Stop ringing after approving a Channel.Type.Call channel
-rw-r--r--src/empathy-event-manager.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index d3949989e..b52729643 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -624,7 +624,8 @@ event_manager_approval_done (EventManagerApproval *approval)
channel_type = tp_channel_get_channel_type_id (approval->main_channel);
- if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA)
+ if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA ||
+ channel_type == TPY_IFACE_QUARK_CHANNEL_TYPE_CALL)
{
priv->ringing--;
if (priv->ringing == 0)