diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-03-02 18:34:47 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-03-02 18:34:47 +0800 |
| commit | 2ba0e02b8c7a180b1785ef85baab66b0f16db964 (patch) | |
| tree | 9f9e7043bb1f4ee3ec8fd701a72bff6981edd104 /src/empathy-notifications-approver.c | |
| parent | fe6c1d00ad01701353fd1f5a85ade27ace898b53 (diff) | |
| parent | c144943be6f1e0255a6309d6559183a9101e10cd (diff) | |
| download | gsoc2013-empathy-2ba0e02b8c7a180b1785ef85baab66b0f16db964.tar gsoc2013-empathy-2ba0e02b8c7a180b1785ef85baab66b0f16db964.tar.gz gsoc2013-empathy-2ba0e02b8c7a180b1785ef85baab66b0f16db964.tar.bz2 gsoc2013-empathy-2ba0e02b8c7a180b1785ef85baab66b0f16db964.tar.lz gsoc2013-empathy-2ba0e02b8c7a180b1785ef85baab66b0f16db964.tar.xz gsoc2013-empathy-2ba0e02b8c7a180b1785ef85baab66b0f16db964.tar.zst gsoc2013-empathy-2ba0e02b8c7a180b1785ef85baab66b0f16db964.zip | |
Merge branch 'empathy-av-ocrete'
Diffstat (limited to 'src/empathy-notifications-approver.c')
| -rw-r--r-- | src/empathy-notifications-approver.c | 9 |
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: |