aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-notifications-approver.c
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-03-02 17:50:09 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-03-02 17:50:09 +0800
commit9c5568e53b09615bee4d516fd8ea29341383fbf7 (patch)
treec72f1f7b9d4fb6985975a4410be805031190fa6f /src/empathy-notifications-approver.c
parent634c2e8376910b96e584159da43a9e708d3a9573 (diff)
downloadgsoc2013-empathy-9c5568e53b09615bee4d516fd8ea29341383fbf7.tar
gsoc2013-empathy-9c5568e53b09615bee4d516fd8ea29341383fbf7.tar.gz
gsoc2013-empathy-9c5568e53b09615bee4d516fd8ea29341383fbf7.tar.bz2
gsoc2013-empathy-9c5568e53b09615bee4d516fd8ea29341383fbf7.tar.lz
gsoc2013-empathy-9c5568e53b09615bee4d516fd8ea29341383fbf7.tar.xz
gsoc2013-empathy-9c5568e53b09615bee4d516fd8ea29341383fbf7.tar.zst
gsoc2013-empathy-9c5568e53b09615bee4d516fd8ea29341383fbf7.zip
Revert "Stop approve StreamedMedia channels"
This reverts commit c7dd14aef20e429135fba7c7a53a8d507b9579a3.
Diffstat (limited to 'src/empathy-notifications-approver.c')
-rw-r--r--src/empathy-notifications-approver.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/empathy-notifications-approver.c b/src/empathy-notifications-approver.c
index bb7f6b458..7a4f03731 100644
--- a/src/empathy-notifications-approver.c
+++ b/src/empathy-notifications-approver.c
@@ -25,6 +25,8 @@
#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>
@@ -188,7 +190,12 @@ 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);
@@ -253,6 +260,7 @@ 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:
@@ -280,6 +288,7 @@ 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: