#include <libnotify/notify.h>
#include <telepathy-glib/telepathy-glib.h>
+#include <telepathy-yell/telepathy-yell.h>
+
#include <libempathy/empathy-contact-manager.h>
+#include <libempathy/empathy-tp-streamed-media.h>
#include <libempathy-gtk/empathy-notify-manager.h>
notification_closed_cb (NotifyNotification *notification,
EmpathyNotificationsApprover *self)
{
- g_object_unref (notification);
-
if (self->priv->notification == notification)
- self->priv->notification = NULL;
+ tp_clear_object (&self->priv->notification);
}
static void
if (self->priv->notification != NULL)
{
notify_notification_close (self->priv->notification, NULL);
- self->priv->notification = NULL;
+ tp_clear_object (&self->priv->notification);
+ }
+}
+
+static void
+notification_approve_no_video_cb (NotifyNotification *notification,
+ gchar *action,
+ EmpathyNotificationsApprover *self)
+{
+ if (self->priv->event)
+ {
+ tpy_call_channel_send_video (
+ TPY_CALL_CHANNEL (self->priv->event->handler_instance),
+ FALSE);
+ empathy_event_approve (self->priv->event);
}
}
add_notification_actions (EmpathyNotificationsApprover *self,
NotifyNotification *notification)
{
+ gboolean video;
+
switch (self->priv->event->type) {
case EMPATHY_EVENT_TYPE_CHAT:
notify_notification_add_action (notification,
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 = tpy_call_channel_has_initial_video (
+ TPY_CALL_CHANNEL (self->priv->event->handler_instance));
+
notify_notification_add_action (notification,
"reject", _("Reject"), (NotifyActionCallback) notification_decline_cb,
self, NULL);
+ if (video && self->priv->event->type == EMPATHY_EVENT_TYPE_CALL)
+ notify_notification_add_action (notification,
+ "answer-no-video", _("Answer"),
+ (NotifyActionCallback) notification_approve_no_video_cb,
+ self, NULL);
+
notify_notification_add_action (notification,
- "answer", _("Answer"), (NotifyActionCallback) notification_approve_cb,
+ "answer", video ? _("Answer with video") : _("Answer"),
+ (NotifyActionCallback) notification_approve_cb,
self, NULL);
break;
"accept", _("Accept"),
(NotifyActionCallback) notification_accept_subscription_cb,
self, NULL);
+ break;
+
+ case EMPATHY_EVENT_TYPE_AUTH:
+ /* translators: the 'Provide' button is displayed in a notification
+ * bubble when Empathy is asking for an account password; clicking on it
+ * brings the password popup. */
+ notify_notification_add_action (notification,
+ "provide", _("Provide"), (NotifyActionCallback) notification_approve_cb,
+ self, NULL);
+ break;
default:
break;
}
}
+static gboolean
+notification_is_urgent (EmpathyNotificationsApprover *self,
+ NotifyNotification *notification)
+{
+ /* Mark as urgent all the notifications with which user should
+ * 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:
+ case EMPATHY_EVENT_TYPE_AUTH:
+ return TRUE;
+
+ case EMPATHY_EVENT_TYPE_SUBSCRIPTION:
+ case EMPATHY_EVENT_TYPE_PRESENCE_ONLINE:
+ case EMPATHY_EVENT_TYPE_PRESENCE_OFFLINE:
+ return FALSE;
+ }
+
+ return FALSE;
+}
+
+/* Use x-empathy as prefix for unofficial categories
+ * http://www.galago-project.org/specs/notification/0.9/x211.html */
+static const gchar *
+get_category_for_event_type (EmpathyEventType type)
+{
+ switch (type) {
+ case EMPATHY_EVENT_TYPE_CHAT:
+ return "im.received";
+ case EMPATHY_EVENT_TYPE_PRESENCE_ONLINE:
+ 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:
+ return "x-empathy.transfer.incoming";
+ case EMPATHY_EVENT_TYPE_INVITATION:
+ return "x-empathy.im.room-invitation";
+ case EMPATHY_EVENT_TYPE_AUTH:
+ return "x-empathy.network.auth-request";
+ case EMPATHY_EVENT_TYPE_SUBSCRIPTION:
+ return "x-empathy.im.subscription-request";
+ }
+
+ return NULL;
+}
+
static void
update_notification (EmpathyNotificationsApprover *self)
{
GdkPixbuf *pixbuf = NULL;
gchar *message_esc = NULL;
gboolean has_x_canonical_append;
- NotifyNotification *notification = self->priv->notification;
+ NotifyNotification *notification;
if (!empathy_notify_manager_notification_is_enabled (self->priv->notify_mgr))
{
has_x_canonical_append = empathy_notify_manager_has_capability (
self->priv->notify_mgr, EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_APPEND);
- if (notification != NULL && ! has_x_canonical_append)
+ if (self->priv->notification != NULL && ! has_x_canonical_append)
{
/* if the notification server does NOT supports x-canonical-append, it is
* better to not use notify_notification_update to avoid
* overwriting the current notification message */
+ notification = g_object_ref (self->priv->notification);
+
notify_notification_update (notification,
self->priv->event->header, message_esc, NULL);
}
else
{
+ const gchar *category;
+
/* if the notification server supports x-canonical-append,
* the hint will be added, so that the message from the
* just created notification will be automatically appended
message_esc, NULL);
if (self->priv->notification == NULL)
- self->priv->notification = notification;
+ {
+ self->priv->notification = g_object_ref (notification);
+
+ g_signal_connect (notification, "closed",
+ G_CALLBACK (notification_closed_cb), self);
+ }
notify_notification_set_timeout (notification,
NOTIFY_EXPIRES_DEFAULT);
if (has_x_canonical_append)
- notify_notification_set_hint_string (notification,
- EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_APPEND, "");
+ {
+ notify_notification_set_hint (notification,
+ EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_APPEND,
+ g_variant_new_boolean (TRUE));
+ }
if (empathy_notify_manager_has_capability (self->priv->notify_mgr,
EMPATHY_NOTIFY_MANAGER_CAP_ACTIONS))
add_notification_actions (self, notification);
- g_signal_connect (notification, "closed",
- G_CALLBACK (notification_closed_cb), self);
+ if (notification_is_urgent (self, notification))
+ notify_notification_set_urgency (notification, NOTIFY_URGENCY_CRITICAL);
+
+ category = get_category_for_event_type (self->priv->event->type);
+ if (category != NULL)
+ {
+ notify_notification_set_hint (notification,
+ EMPATHY_NOTIFY_MANAGER_CAP_CATEGORY,
+ g_variant_new_string (category));
+ }
}
pixbuf = empathy_notify_manager_get_pixbuf_for_notification (
if (pixbuf != NULL)
{
- notify_notification_set_icon_from_pixbuf (notification, pixbuf);
+ notify_notification_set_image_from_pixbuf (notification, pixbuf);
g_object_unref (pixbuf);
}
notify_notification_show (notification, NULL);
g_free (message_esc);
+ g_object_unref (notification);
}
static void
return;
self->priv->event = event;
+
update_notification (self);
}