diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-02-21 22:46:02 +0800 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-02-21 23:02:29 +0800 |
commit | c7dd14aef20e429135fba7c7a53a8d507b9579a3 (patch) | |
tree | b44663dba676e41af28719da704ef1c55d0291cf /src/empathy-notifications-approver.c | |
parent | b48a8176d050de2d03bed6c5f00b451f3ca5c750 (diff) | |
download | gsoc2013-empathy-c7dd14aef20e429135fba7c7a53a8d507b9579a3.tar gsoc2013-empathy-c7dd14aef20e429135fba7c7a53a8d507b9579a3.tar.gz gsoc2013-empathy-c7dd14aef20e429135fba7c7a53a8d507b9579a3.tar.bz2 gsoc2013-empathy-c7dd14aef20e429135fba7c7a53a8d507b9579a3.tar.lz gsoc2013-empathy-c7dd14aef20e429135fba7c7a53a8d507b9579a3.tar.xz gsoc2013-empathy-c7dd14aef20e429135fba7c7a53a8d507b9579a3.tar.zst gsoc2013-empathy-c7dd14aef20e429135fba7c7a53a8d507b9579a3.zip |
Stop approve StreamedMedia channels
https://bugzilla.gnome.org/show_bug.cgi?id=629902
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 7a4f03731..bb7f6b458 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> @@ -190,12 +188,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); @@ -260,7 +253,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) return "presence.online"; case EMPATHY_EVENT_TYPE_PRESENCE_OFFLINE: return "presence.offline"; - case EMPATHY_EVENT_TYPE_VOIP: case EMPATHY_EVENT_TYPE_CALL: return "x-empathy.call.incoming"; case EMPATHY_EVENT_TYPE_TRANSFER: |