diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2011-11-14 18:23:57 +0800 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-01-10 21:26:59 +0800 |
| commit | af4d97822b9055fd8a7670b53b28c7c1f820ec65 (patch) | |
| tree | ea2618caaee98e447e20e87dedf72ccd3d2bcbbb /libempathy-gtk/empathy-log-window.c | |
| parent | 66e1966ee3b3303968997f229f62ada8d7b519ba (diff) | |
| download | gsoc2013-empathy-af4d97822b9055fd8a7670b53b28c7c1f820ec65.tar gsoc2013-empathy-af4d97822b9055fd8a7670b53b28c7c1f820ec65.tar.gz gsoc2013-empathy-af4d97822b9055fd8a7670b53b28c7c1f820ec65.tar.bz2 gsoc2013-empathy-af4d97822b9055fd8a7670b53b28c7c1f820ec65.tar.lz gsoc2013-empathy-af4d97822b9055fd8a7670b53b28c7c1f820ec65.tar.xz gsoc2013-empathy-af4d97822b9055fd8a7670b53b28c7c1f820ec65.tar.zst gsoc2013-empathy-af4d97822b9055fd8a7670b53b28c7c1f820ec65.zip | |
Remove tp-yell and use TpCallChannel
Diffstat (limited to 'libempathy-gtk/empathy-log-window.c')
| -rw-r--r-- | libempathy-gtk/empathy-log-window.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libempathy-gtk/empathy-log-window.c b/libempathy-gtk/empathy-log-window.c index 51a47c7a3..13fdefbd5 100644 --- a/libempathy-gtk/empathy-log-window.c +++ b/libempathy-gtk/empathy-log-window.c @@ -34,8 +34,6 @@ #include <telepathy-glib/telepathy-glib.h> #include <telepathy-glib/proxy-subclass.h> -#include <telepathy-yell/telepathy-yell.h> - #include <telepathy-logger/telepathy-logger.h> #ifdef HAVE_CALL_LOGS # include <telepathy-logger/call-event.h> @@ -873,7 +871,7 @@ maybe_refresh_logs (TpChannel *channel, !(event_mask & TPL_EVENT_MASK_TEXT)) goto out; if ((!tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA) || - !tp_strdiff (type, TPY_IFACE_CHANNEL_TYPE_CALL)) && + !tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_CALL)) && !(event_mask & TPL_EVENT_MASK_CALL)) goto out; @@ -1015,7 +1013,7 @@ observe_channels (TpSimpleObserver *observer, tp_g_signal_connect_object (channel, "invalidated", G_CALLBACK (on_channel_ended), self, 0); } - else if (!tp_strdiff (type, TPY_IFACE_CHANNEL_TYPE_CALL) || + else if (!tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_CALL) || !tp_strdiff (type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA)) { g_hash_table_insert (self->priv->channels, @@ -1060,7 +1058,7 @@ 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, - TPY_IFACE_CHANNEL_TYPE_CALL, + TP_IFACE_CHANNEL_TYPE_CALL, NULL)); tp_base_client_register (self->priv->observer, NULL); |