* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+#include "empathy-client-factory.h"
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <telepathy-glib/account-channel-request.h>
-#include <telepathy-glib/simple-handler.h>
-#include <telepathy-glib/interfaces.h>
-#include <telepathy-glib/util.h>
-
-#include <telepathy-yell/telepathy-yell.h>
-
-#include <libempathy/empathy-client-factory.h>
-#include <libempathy/empathy-request-util.h>
-#include <libempathy/empathy-tp-contact-factory.h>
-#include <libempathy/empathy-utils.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
#include "empathy-call-factory.h"
#include "empathy-call-handler.h"
+#include "empathy-request-util.h"
#define DEBUG_FLAG EMPATHY_DEBUG_VOIP
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
G_DEFINE_TYPE(EmpathyCallFactory, empathy_call_factory, TP_TYPE_BASE_CLIENT)
tp_base_client_take_approver_filter (client, 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));
tp_base_client_take_handler_filter (client, 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));
tp_base_client_take_handler_filter (client, 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,
- TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, G_TYPE_BOOLEAN, TRUE,
+ TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, G_TYPE_BOOLEAN, TRUE,
NULL));
tp_base_client_take_handler_filter (client, 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,
- TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, G_TYPE_BOOLEAN, TRUE,
+ TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, G_TYPE_BOOLEAN, TRUE,
NULL));
tp_base_client_add_handler_capabilities_varargs (client,
- "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/ice-udp",
- "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/gtalk-p2p",
- "org.freedesktop.Telepathy.Channel.Interface.MediaSignalling/video/h264",
- NULL);
+ "org.freedesktop.Telepathy.Channel.Type.Call1/audio",
+ "org.freedesktop.Telepathy.Channel.Type.Call1/video",
+ "org.freedesktop.Telepathy.Channel.Type.Call1/ice",
+ "org.freedesktop.Telepathy.Channel.Type.Call1/gtalk-p2p",
+ "org.freedesktop.Telepathy.Channel.Type.Call1/video/h264",
+ NULL);
}
static GObject *
NULL, NULL,
g_cclosure_marshal_generic,
G_TYPE_NONE,
- 2, EMPATHY_TYPE_CALL_HANDLER, G_TYPE_BOOLEAN);
+ 2, EMPATHY_TYPE_CALL_HANDLER, G_TYPE_UINT64);
signals[INCOMING_CALL] =
g_signal_new ("incoming-call",
NULL, NULL,
g_cclosure_marshal_generic,
G_TYPE_BOOLEAN,
- 4, G_TYPE_UINT, TPY_TYPE_CALL_CHANNEL,
+ 4, G_TYPE_UINT, TP_TYPE_CALL_CHANNEL,
TP_TYPE_CHANNEL_DISPATCH_OPERATION,
TP_TYPE_ADD_DISPATCH_OPERATION_CONTEXT);
}
self = EMPATHY_CALL_FACTORY (g_object_new (EMPATHY_TYPE_CALL_FACTORY,
"account-manager", am,
"factory", factory,
- "name", EMPATHY_CALL_BUS_NAME_SUFFIX,
+ "name", EMPATHY_CALL_TP_BUS_NAME_SUFFIX,
NULL));
g_object_unref (am);
return EMPATHY_CALL_FACTORY (call_factory);
}
-static void
-call_channel_got_contact (TpConnection *connection,
- EmpathyContact *contact,
- const GError *error,
- gpointer user_data,
- GObject *weak_object)
-{
- EmpathyCallFactory *factory = EMPATHY_CALL_FACTORY (weak_object);
- EmpathyCallHandler *handler;
- TpyCallChannel *call = TPY_CALL_CHANNEL (user_data);
-
- if (contact == NULL)
- {
- /* FIXME use hangup with an appropriate error */
- tp_channel_close_async (TP_CHANNEL (call), NULL, NULL);
- return;
- }
-
- handler = empathy_call_handler_new_for_channel (call, contact);
-
- g_signal_emit (factory, signals[NEW_CALL_HANDLER], 0,
- handler, FALSE);
-
- g_object_unref (handler);
-}
-
-static void
-call_channel_ready (EmpathyCallFactory *factory,
- TpyCallChannel *call)
-{
- TpChannel *channel = TP_CHANNEL (call);
- const gchar *id;
-
- id = tp_channel_get_identifier (channel);
-
- /* The ready callback has a reference, so pass that on */
- empathy_tp_contact_factory_get_from_id (
- tp_channel_borrow_connection (channel),
- id,
- call_channel_got_contact,
- channel,
- g_object_unref,
- (GObject *) factory);
-}
-
-static void
-call_channel_ready_cb (TpyCallChannel *call,
- GParamSpec *spec,
- EmpathyCallFactory *factory)
-{
- gboolean ready;
-
- g_object_get (call, "ready", &ready, NULL);
- if (!ready)
- return;
-
- call_channel_ready (factory, call);
-}
-
-
static void
handle_channels (TpBaseClient *client,
TpAccount *account,
for (l = channels; l != NULL; l = g_list_next (l))
{
TpChannel *channel = l->data;
- TpyCallChannel *call;
- gboolean ready;
+ TpCallChannel *call;
+ TpContact *tp_contact;
+ EmpathyContact *contact;
+ EmpathyCallHandler *handler;
if (tp_proxy_get_invalidated (channel) != NULL)
continue;
if (tp_channel_get_channel_type_id (channel) !=
- TPY_IFACE_QUARK_CHANNEL_TYPE_CALL)
+ TP_IFACE_QUARK_CHANNEL_TYPE_CALL)
continue;
- if (!TPY_IS_CALL_CHANNEL (channel))
+ if (!TP_IS_CALL_CHANNEL (channel))
continue;
- call = TPY_CALL_CHANNEL (channel);
+ call = TP_CALL_CHANNEL (channel);
+
+ tp_contact = tp_channel_get_target_contact (channel);
+ contact = empathy_contact_dup_from_tp_contact (tp_contact);
+ handler = empathy_call_handler_new_for_channel (call, contact);
- /* Take a ref to keep while hopping through the async callbacks */
- g_object_ref (call);
- g_object_get (call, "ready", &ready, NULL);
+ g_signal_emit (self, signals[NEW_CALL_HANDLER], 0,
+ handler, user_action_time);
- if (!ready)
- tp_g_signal_connect_object (call, "notify::ready",
- G_CALLBACK (call_channel_ready_cb), self, 0);
- else
- call_channel_ready (self, call);
+ g_object_unref (handler);
+ g_object_unref (contact);
}
tp_handle_channels_context_accept (context);
}
-static TpyCallChannel *
+static TpCallChannel *
find_call_channel (GList *channels)
{
GList *l;
channel_type = tp_channel_get_channel_type_id (channel);
- if (channel_type == TPY_IFACE_QUARK_CHANNEL_TYPE_CALL)
- return TPY_CALL_CHANNEL (channel);
+ if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_CALL)
+ return TP_CALL_CHANNEL (channel);
}
return NULL;
TpAddDispatchOperationContext *context)
{
EmpathyCallFactory *self = EMPATHY_CALL_FACTORY (client);
- TpyCallChannel *channel;
+ TpCallChannel *channel;
guint handle;
- GError error = { TP_ERRORS, TP_ERROR_INVALID_ARGUMENT, "" };
+ GError error = { TP_ERROR, TP_ERROR_INVALID_ARGUMENT, "" };
gboolean handled = FALSE;
channel = find_call_channel (channels);
projects / empathy.git / blobdiff