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 /libempathy-gtk | |
| 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 'libempathy-gtk')
| -rw-r--r-- | libempathy-gtk/empathy-log-window.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index 2a9ba6724..55202d3be 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -881,8 +881,7 @@ maybe_refresh_logs (TpChannel *channel, if (!tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_TEXT) && !(event_mask & TPL_EVENT_MASK_TEXT)) goto out; - if ((!tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA) || - !tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_CALL)) && + if ((!tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_CALL)) && !(event_mask & TPL_EVENT_MASK_CALL)) goto out; @@ -1024,8 +1023,7 @@ observe_channels (TpSimpleObserver *observer, tp_g_signal_connect_object (channel, "invalidated", G_CALLBACK (on_channel_ended), self, 0); } - else if (!tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_CALL) || - !tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA)) + else if (!tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_CALL)) { g_hash_table_insert (self->priv->channels, g_object_ref (channel), g_object_ref (account)); @@ -1064,11 +1062,6 @@ log_window_create_observer (EmpathyLogWindow *self) 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, - NULL)); - tp_base_client_take_observer_filter (self->priv->observer, - tp_asv_new ( - TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_CALL, NULL)); |