* Authors: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
*/
-#include <config.h>
-
-#include <telepathy-glib/telepathy-glib.h>
-
-#include <telepathy-yell/telepathy-yell.h>
-
-#include <libempathy/empathy-channel-factory.h>
-#include <libempathy/empathy-utils.h>
+#include "config.h"
+#include "empathy-call-observer.h"
-#include <extensions/extensions.h>
+#include <glib/gi18n-lib.h>
+#include <tp-account-widgets/tpaw-images.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
-#include "empathy-call-observer.h"
+#include "empathy-notify-manager.h"
-#define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
-#include <libempathy/empathy-debug.h>
+#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
+#include "empathy-debug.h"
struct _EmpathyCallObserverPriv {
+ EmpathyNotifyManager *notify_mgr;
+
TpBaseClient *observer;
/* Ongoing calls, as reffed TpChannels */
gchar *message,
EmpathyCallObserver *self)
{
+ DEBUG ("channel %s has been invalidated; stop observing it",
+ tp_proxy_get_object_path (proxy));
+
self->priv->channels = g_list_remove (self->priv->channels, proxy);
g_object_unref (proxy);
}
+typedef struct
+{
+ EmpathyCallObserver *self;
+ TpObserveChannelsContext *context;
+ TpChannel *main_channel;
+} AutoRejectCtx;
+
+static AutoRejectCtx *
+auto_reject_ctx_new (EmpathyCallObserver *self,
+ TpObserveChannelsContext *context,
+ TpChannel *main_channel)
+{
+ AutoRejectCtx *ctx = g_slice_new (AutoRejectCtx);
+
+ ctx->self = g_object_ref (self);
+ ctx->context = g_object_ref (context);
+ ctx->main_channel = g_object_ref (main_channel);
+ return ctx;
+}
+
static void
-on_cdo_claim_cb (GObject *source_object,
- GAsyncResult *result,
- gpointer user_data)
+auto_reject_ctx_free (AutoRejectCtx *ctx)
{
- TpChannelDispatchOperation *cdo;
- TpChannel *channel = TP_CHANNEL (user_data);
- GError *error = NULL;
+ g_object_unref (ctx->self);
+ g_object_unref (ctx->context);
+ g_object_unref (ctx->main_channel);
+ g_slice_free (AutoRejectCtx, ctx);
+}
+
+static void
+display_reject_notification (EmpathyCallObserver *self,
+ TpChannel *channel)
+{
+ TpContact *contact;
+ NotifyNotification *notification;
+ gchar *summary, *body;
+ EmpathyContact *emp_contact;
+ GdkPixbuf *pixbuf;
+
+ contact = tp_channel_get_target_contact (channel);
- cdo = TP_CHANNEL_DISPATCH_OPERATION (source_object);
+ summary = g_strdup_printf (_("Missed call from %s"),
+ tp_contact_get_alias (contact));
+ body = g_strdup_printf (
+ _("%s just tried to call you, but you were in another call."),
+ tp_contact_get_alias (contact));
- tp_channel_dispatch_operation_claim_finish (cdo, result, &error);
- if (error != NULL)
+ notification = empathy_notify_manager_create_notification (summary, body,
+ NULL);
+
+ emp_contact = empathy_contact_dup_from_tp_contact (contact);
+ pixbuf = empathy_notify_manager_get_pixbuf_for_notification (
+ self->priv->notify_mgr, emp_contact, TPAW_IMAGE_AVATAR_DEFAULT);
+
+ if (pixbuf != NULL)
{
- DEBUG ("Could not claim CDO: %s", error->message);
- g_error_free (error);
- return;
+ notify_notification_set_icon_from_pixbuf (notification, pixbuf);
+ g_object_unref (pixbuf);
}
- tp_channel_leave_async (channel,
- TP_CHANNEL_GROUP_CHANGE_REASON_BUSY, "Already in a call",
- NULL, NULL);
+ notify_notification_show (notification, NULL);
+
+ g_object_unref (notification);
+ g_free (summary);
+ g_free (body);
+ g_object_unref (emp_contact);
}
static TpChannel *
channel_type = tp_channel_get_channel_type_id (channel);
- if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_STREAMED_MEDIA ||
- channel_type == TPY_IFACE_QUARK_CHANNEL_TYPE_CALL)
+ if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_CALL)
return channel;
}
GQuark type = tp_channel_get_channel_type_id (channel);
/* Check that Call channels are not ended */
- if (type == TPY_IFACE_QUARK_CHANNEL_TYPE_CALL &&
- tpy_call_channel_get_state (TPY_CALL_CHANNEL (channel), NULL, NULL)
- == TPY_CALL_STATE_ENDED)
+ if (type == TP_IFACE_QUARK_CHANNEL_TYPE_CALL &&
+ tp_call_channel_get_state (TP_CALL_CHANNEL (channel),
+ NULL, NULL, NULL) == TP_CALL_STATE_ENDED)
continue;
return TRUE;
return FALSE;
}
+static void
+claim_and_leave_cb (GObject *source,
+ GAsyncResult *result,
+ gpointer user_data)
+{
+ AutoRejectCtx *ctx = user_data;
+ GError *error = NULL;
+
+ if (!tp_channel_dispatch_operation_leave_channels_finish (
+ TP_CHANNEL_DISPATCH_OPERATION (source), result, &error))
+ {
+ DEBUG ("Failed to reject call: %s", error->message);
+
+ g_error_free (error);
+ goto out;
+ }
+
+ display_reject_notification (ctx->self, ctx->main_channel);
+
+out:
+ auto_reject_ctx_free (ctx);
+}
+
static void
observe_channels (TpSimpleObserver *observer,
TpAccount *account,
channel = find_main_channel (channels);
if (channel == NULL)
{
- GError err = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT,
+ GError err = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT,
"Unknown channel type" };
- DEBUG ("Didn't find any Call or StreamedMedia channel; ignoring");
+ DEBUG ("Didn't find any Call channel; ignoring");
tp_observe_channels_context_fail (context, &err);
return;
/* Autoreject if there are other ongoing calls */
if (has_ongoing_calls (self))
{
+ AutoRejectCtx *ctx = auto_reject_ctx_new (self, context, channel);
+
DEBUG ("Autorejecting incoming call since there are others in "
"progress: %s", tp_proxy_get_object_path (channel));
- tp_channel_dispatch_operation_claim_async (dispatch_operation,
- on_cdo_claim_cb, g_object_ref (channel));
+
+ tp_channel_dispatch_operation_leave_channels_async (dispatch_operation,
+ TP_CHANNEL_GROUP_CHANGE_REASON_BUSY, "Already in a call",
+ claim_and_leave_cb, ctx);
+
+ tp_observe_channels_context_accept (context);
return;
}
{
DEBUG ("The channel has already been invalidated: %s",
error->message);
+
+ tp_observe_channels_context_fail (context, error);
return;
}
+ DEBUG ("Observing channel %s", tp_proxy_get_object_path (channel));
+
tp_g_signal_connect_object (channel, "invalidated",
G_CALLBACK (on_channel_closed), self, 0);
self->priv->channels = g_list_prepend (self->priv->channels,
{
EmpathyCallObserver *self = EMPATHY_CALL_OBSERVER (object);
+ tp_clear_object (&self->priv->notify_mgr);
tp_clear_object (&self->priv->observer);
g_list_free_full (self->priv->channels, g_object_unref);
self->priv->channels = NULL;
{
EmpathyCallObserverPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
EMPATHY_TYPE_CALL_OBSERVER, EmpathyCallObserverPriv);
- TpDBusDaemon *dbus;
- EmpathyChannelFactory *factory;
+ TpAccountManager *am;
GError *error = NULL;
self->priv = priv;
- dbus = tp_dbus_daemon_dup (&error);
- if (dbus == NULL)
- {
- DEBUG ("Failed to get TpDBusDaemon: %s", error->message);
- g_error_free (error);
- return;
- }
+ self->priv->notify_mgr = empathy_notify_manager_dup_singleton ();
+
+ am = tp_account_manager_dup ();
- self->priv->observer = tp_simple_observer_new (dbus, FALSE,
+ self->priv->observer = tp_simple_observer_new_with_am (am, TRUE,
"Empathy.CallObserver", FALSE,
observe_channels, self, NULL);
- factory = empathy_channel_factory_dup ();
- tp_base_client_set_channel_factory (self->priv->observer,
- TP_CLIENT_CHANNEL_FACTORY (factory));
- g_object_unref (factory);
-
- /* Observe Call and StreamedMedia channels */
- tp_base_client_take_observer_filter (self->priv->observer,
- tp_asv_new (
- TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
- TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA,
- TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
- TP_HANDLE_TYPE_CONTACT,
- NULL));
+ /* Observe Call channels */
tp_base_client_take_observer_filter (self->priv->observer,
tp_asv_new (
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
- TPY_IFACE_CHANNEL_TYPE_CALL,
+ TP_IFACE_CHANNEL_TYPE_CALL,
TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT,
TP_HANDLE_TYPE_CONTACT,
NULL));
g_error_free (error);
}
- g_object_unref (dbus);
+ g_object_unref (am);
}
EmpathyCallObserver *