diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-05-02 22:18:18 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-05-02 22:22:55 +0800 |
| commit | 5a6db15dbaaa9f3aa902d5ae2299bdb5ee83a9d8 (patch) | |
| tree | 9756efae1772fdd4c292c1b6a5f54b6d77a77f13 /src/empathy-notifications-approver.c | |
| parent | d3ea58c51fd403f0d5e4913193095f3890423fb9 (diff) | |
| download | gsoc2013-empathy-5a6db15dbaaa9f3aa902d5ae2299bdb5ee83a9d8.tar gsoc2013-empathy-5a6db15dbaaa9f3aa902d5ae2299bdb5ee83a9d8.tar.gz gsoc2013-empathy-5a6db15dbaaa9f3aa902d5ae2299bdb5ee83a9d8.tar.bz2 gsoc2013-empathy-5a6db15dbaaa9f3aa902d5ae2299bdb5ee83a9d8.tar.lz gsoc2013-empathy-5a6db15dbaaa9f3aa902d5ae2299bdb5ee83a9d8.tar.xz gsoc2013-empathy-5a6db15dbaaa9f3aa902d5ae2299bdb5ee83a9d8.tar.zst gsoc2013-empathy-5a6db15dbaaa9f3aa902d5ae2299bdb5ee83a9d8.zip | |
Stop approving StreamedMedia channels
https://bugzilla.gnome.org/show_bug.cgi?id=675296
Diffstat (limited to 'src/empathy-notifications-approver.c')
| -rw-r--r-- | src/empathy-notifications-approver.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/empathy-notifications-approver.c b/src/empathy-notifications-approver.c index 92b3f7475..b6abd8c6b 100644 --- a/src/empathy-notifications-approver.c +++ b/src/empathy-notifications-approver.c @@ -25,8 +25,6 @@ #include <libnotify/notify.h> #include <telepathy-glib/telepathy-glib.h> -#include <libempathy/empathy-tp-streamed-media.h> - #include <libempathy-gtk/empathy-notify-manager.h> #include <libempathy-gtk/empathy-call-utils.h> @@ -191,12 +189,7 @@ add_notification_actions (EmpathyNotificationsApprover *self, self, NULL); break; - case EMPATHY_EVENT_TYPE_VOIP: case EMPATHY_EVENT_TYPE_CALL: - if (self->priv->event->type == EMPATHY_EVENT_TYPE_VOIP) - video = empathy_tp_streamed_media_has_initial_video ( - EMPATHY_TP_STREAMED_MEDIA (self->priv->event->handler_instance)); - else video = tp_call_channel_has_initial_video ( TP_CALL_CHANNEL (self->priv->event->handler_instance), NULL); @@ -261,7 +254,6 @@ notification_is_urgent (EmpathyNotificationsApprover *self, * interact ASAP */ switch (self->priv->event->type) { case EMPATHY_EVENT_TYPE_CHAT: - case EMPATHY_EVENT_TYPE_VOIP: case EMPATHY_EVENT_TYPE_CALL: case EMPATHY_EVENT_TYPE_TRANSFER: case EMPATHY_EVENT_TYPE_INVITATION: @@ -288,7 +280,6 @@ get_category_for_event_type (EmpathyEventType type) CASE(CHAT) CASE(PRESENCE_ONLINE) CASE(PRESENCE_OFFLINE) - CASE(VOIP) CASE(CALL) CASE(TRANSFER) CASE(INVITATION) |