* Authors: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
*/
-#include <config.h>
-#include <string.h>
+#include "config.h"
#include <glib/gi18n.h>
-#include <libnotify/notification.h>
-#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>
+#include "libempathy-gtk/empathy-notify-manager.h"
+#include "libempathy-gtk/empathy-call-utils.h"
#include "empathy-event-manager.h"
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
-#include <libempathy/empathy-debug.h>
+#include "libempathy/empathy-debug.h"
#include "empathy-notifications-approver.h"
{
if (self->priv->event)
{
- tpy_call_channel_send_video (
- TPY_CALL_CHANNEL (self->priv->event->handler_instance),
+ empathy_call_channel_send_video (
+ TP_CALL_CHANNEL (self->priv->event->handler_instance),
FALSE);
empathy_event_approve (self->priv->event);
}
gchar *action,
EmpathyNotificationsApprover *self)
{
- EmpathyContactManager *manager;
-
if (self->priv->event == NULL)
return;
- manager = empathy_contact_manager_dup_singleton ();
- empathy_contact_list_remove (EMPATHY_CONTACT_LIST (manager),
- self->priv->event->contact, "");
+ empathy_contact_remove_from_contact_list (self->priv->event->contact);
empathy_event_remove (self->priv->event);
-
- g_object_unref (manager);
}
static void
gchar *action,
EmpathyNotificationsApprover *self)
{
- EmpathyContactManager *manager;
-
if (self->priv->event == NULL)
return;
- manager = empathy_contact_manager_dup_singleton ();
- empathy_contact_list_add (EMPATHY_CONTACT_LIST (manager),
- self->priv->event->contact, "");
+ empathy_contact_add_to_contact_list (self->priv->event->contact, "");
empathy_event_remove (self->priv->event);
-
- g_object_unref (manager);
}
static void
switch (self->priv->event->type) {
case EMPATHY_EVENT_TYPE_CHAT:
+ case EMPATHY_EVENT_TYPE_MENTIONED:
notify_notification_add_action (notification,
"respond", _("Respond"), (NotifyActionCallback) notification_approve_cb,
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 = tpy_call_channel_has_initial_video (
- TPY_CALL_CHANNEL (self->priv->event->handler_instance));
+ video = tp_call_channel_has_initial_video (
+ TP_CALL_CHANNEL (self->priv->event->handler_instance), NULL);
notify_notification_add_action (notification,
"reject", _("Reject"), (NotifyActionCallback) notification_decline_cb,
* 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:
+ case EMPATHY_EVENT_TYPE_MENTIONED:
return TRUE;
case EMPATHY_EVENT_TYPE_SUBSCRIPTION:
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)
{
+#define CASE(x) \
+ case EMPATHY_EVENT_TYPE_##x: \
+ return EMPATHY_NOTIFICATION_CATEGORY_##x;
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";
+ CASE(CHAT)
+ CASE(PRESENCE_ONLINE)
+ CASE(PRESENCE_OFFLINE)
+ CASE(CALL)
+ CASE(TRANSFER)
+ CASE(INVITATION)
+ CASE(AUTH)
+ CASE(SUBSCRIPTION)
+ CASE(MENTIONED)
}
+#undef CASE
return NULL;
}
* to an existing notification with the same title.
* In this way the previous message will not be lost: the new
* message will appear below it, in the same notification */
- notification = notify_notification_new (self->priv->event->header,
- message_esc, NULL);
+ notification = empathy_notify_manager_create_notification (
+ self->priv->event->header, message_esc, NULL);
if (self->priv->notification == NULL)
{
G_CALLBACK (notification_closed_cb), self);
}
- notify_notification_set_timeout (notification,
- NOTIFY_EXPIRES_DEFAULT);
-
if (has_x_canonical_append)
{
notify_notification_set_hint (notification,