aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2011-02-24 00:45:16 +0800
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>2011-06-09 17:20:06 +0800
commit0d3fa03b5a9b8d2d9737c8f39aada70669fde194 (patch)
tree0d1c02fb2bda9c42ebcf260d9f1577f5293dba3a /src
parent2f449f6afa43994b4431b07c3ed582b6408a0533 (diff)
downloadgsoc2013-empathy-0d3fa03b5a9b8d2d9737c8f39aada70669fde194.tar
gsoc2013-empathy-0d3fa03b5a9b8d2d9737c8f39aada70669fde194.tar.gz
gsoc2013-empathy-0d3fa03b5a9b8d2d9737c8f39aada70669fde194.tar.bz2
gsoc2013-empathy-0d3fa03b5a9b8d2d9737c8f39aada70669fde194.tar.lz
gsoc2013-empathy-0d3fa03b5a9b8d2d9737c8f39aada70669fde194.tar.xz
gsoc2013-empathy-0d3fa03b5a9b8d2d9737c8f39aada70669fde194.tar.zst
gsoc2013-empathy-0d3fa03b5a9b8d2d9737c8f39aada70669fde194.zip
Stop ringing after approving a Channel.Type.Call channel
Diffstat (limited to 'src')
-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 d5d1480f5..32b805423 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -635,7 +635,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)