diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-10-22 16:38:21 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-10-22 18:52:19 +0800 |
| commit | 0e2e4e79bf14b2bd72458ca0a60c5b8dc1c9b67a (patch) | |
| tree | 286541caf884b86f9c517126ce1a7242432113de /src | |
| parent | 9fe2361afd9beb6fa5ab10f6caed08b264adcaf5 (diff) | |
| download | gsoc2013-empathy-0e2e4e79bf14b2bd72458ca0a60c5b8dc1c9b67a.tar gsoc2013-empathy-0e2e4e79bf14b2bd72458ca0a60c5b8dc1c9b67a.tar.gz gsoc2013-empathy-0e2e4e79bf14b2bd72458ca0a60c5b8dc1c9b67a.tar.bz2 gsoc2013-empathy-0e2e4e79bf14b2bd72458ca0a60c5b8dc1c9b67a.tar.lz gsoc2013-empathy-0e2e4e79bf14b2bd72458ca0a60c5b8dc1c9b67a.tar.xz gsoc2013-empathy-0e2e4e79bf14b2bd72458ca0a60c5b8dc1c9b67a.tar.zst gsoc2013-empathy-0e2e4e79bf14b2bd72458ca0a60c5b8dc1c9b67a.zip | |
Stop observing/approving StreamedMedia channels
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-call-observer.c | 14 | ||||
| -rw-r--r-- | src/empathy-event-manager.c | 9 |
2 files changed, 4 insertions, 19 deletions
diff --git a/src/empathy-call-observer.c b/src/empathy-call-observer.c index 93f2515f5..82887b009 100644 --- a/src/empathy-call-observer.c +++ b/src/empathy-call-observer.c @@ -147,8 +147,7 @@ find_main_channel (GList *channels) channel_type = tp_channel_get_channel_type_id (channel); - if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA || - channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_CALL) + if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_CALL) return channel; } @@ -220,7 +219,7 @@ observe_channels (TpSimpleObserver *observer, GError err = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "Unknown channel type" }; - DEBUG ("Didn't find any Call or StreamedMedia channel; ignoring"); + DEBUG ("Didn't find any Call channel; ignoring"); tp_observe_channels_context_fail (context, &err); return; @@ -324,14 +323,7 @@ empathy_call_observer_init (EmpathyCallObserver *self) "Empathy.CallObserver", FALSE, observe_channels, self, NULL); - /* Observe Call and StreamedMedia channels */ - tp_base_client_take_observer_filter (self->priv->observer, - tp_asv_new ( - TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, - TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA, - TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, - TP_HANDLE_TYPE_CONTACT, - NULL)); + /* Observe Call channels */ tp_base_client_take_observer_filter (self->priv->observer, tp_asv_new ( TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c index b8f1a477b..e5b19e2ad 100644 --- a/src/empathy-event-manager.c +++ b/src/empathy-event-manager.c @@ -797,8 +797,7 @@ find_main_channel (GList *channels) channel_type = tp_channel_get_channel_type_id (channel); - if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA || - channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_CALL || + if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_CALL || channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER || channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION) return channel; @@ -1408,12 +1407,6 @@ empathy_event_manager_init (EmpathyEventManager *manager) tp_base_client_take_approver_filter (priv->approver, tp_asv_new ( TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, - TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA, - TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT, - NULL)); - tp_base_client_take_approver_filter (priv->approver, - tp_asv_new ( - TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_CALL, TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT, NULL)); |