From 88c7ff0d33171e9ee7ece04c001f8e5c5fd4a3b9 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Fri, 18 Feb 2011 17:00:32 +0000 Subject: empathy_call_new_with_streams: start Calls when we support them Conflicts: libempathy/empathy-utils.c --- libempathy/empathy-utils.c | 90 +++++++++++++++++++++++++++++++++++++++++----- libempathy/empathy-utils.h | 17 +++++---- 2 files changed, 92 insertions(+), 15 deletions(-) (limited to 'libempathy') diff --git a/libempathy/empathy-utils.c b/libempathy/empathy-utils.c index 4d6506b6e..6bb7148a2 100644 --- a/libempathy/empathy-utils.c +++ b/libempathy/empathy-utils.c @@ -46,6 +46,10 @@ #include #include +#if HAVE_CALL + #include +#endif + #include "empathy-utils.h" #include "empathy-contact-manager.h" #include "empathy-individual-manager.h" @@ -238,6 +242,26 @@ empathy_xml_node_find_child_prop_value (xmlNodePtr node, return found; } +#if HAVE_CALL +GHashTable * +empathy_call_create_call_request (EmpathyContact *contact, + gboolean initial_audio, + gboolean initial_video) +{ + return tp_asv_new ( + TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, + TPY_IFACE_CHANNEL_TYPE_CALL, + TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT, + TP_PROP_CHANNEL_TARGET_HANDLE, G_TYPE_UINT, + empathy_contact_get_handle (contact), + TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, G_TYPE_BOOLEAN, + initial_audio, + TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, G_TYPE_BOOLEAN, + initial_video, + NULL); +} +#endif + GHashTable * empathy_call_create_streamed_media_request (EmpathyContact *contact, gboolean initial_audio, @@ -258,9 +282,9 @@ empathy_call_create_streamed_media_request (EmpathyContact *contact, } static void -create_media_channel_cb (GObject *source, - GAsyncResult *result, - gpointer user_data) +create_streamed_media_channel_cb (GObject *source, + GAsyncResult *result, + gpointer user_data) { GError *error = NULL; @@ -272,29 +296,79 @@ create_media_channel_cb (GObject *source, } } +#if HAVE_CALL +static void +create_call_channel_cb (GObject *source, + GAsyncResult *result, + gpointer user_data) +{ + TpAccountChannelRequest *streamed_media_req = user_data; + GError *error = NULL; + + if (tp_account_channel_request_create_channel_finish ( + TP_ACCOUNT_CHANNEL_REQUEST (source), result, &error)) { + g_object_unref (streamed_media_req); + return; + } + + DEBUG ("Failed to create Call channel: %s", error->message); + DEBUG ("Let's try with an StreamedMedia channel"); + g_error_free (error); + tp_account_channel_request_create_channel_async (streamed_media_req, EMPATHY_AV_BUS_NAME, NULL, + create_streamed_media_channel_cb, + NULL); +} +#endif + void empathy_call_new_with_streams (EmpathyContact *contact, gboolean initial_audio, gboolean initial_video, gint64 timestamp) { - GHashTable *request; +#if HAVE_CALL + GHashTable *call_request, *streamed_media_request; TpAccount *account; + TpAccountChannelRequest *call_req, *streamed_media_req; + + call_request = empathy_call_create_call_request (contact, + initial_audio, + initial_video); + + streamed_media_request = empathy_call_create_streamed_media_request ( + contact, initial_audio, initial_video); + + account = empathy_contact_get_account (contact); + + call_req = tp_account_channel_request_new (account, call_request, timestamp); + streamed_media_req = tp_account_channel_request_new (account, + streamed_media_request, + timestamp); + + tp_account_channel_request_create_channel_async (call_req, EMPATHY_CALL_BUS_NAME, NULL, + create_call_channel_cb, + streamed_media_req); + + g_hash_table_unref (call_request); + g_hash_table_unref (streamed_media_request); + g_object_unref (call_req); +#else + GHashTable *request; TpAccountChannelRequest *req; request = empathy_call_create_streamed_media_request (contact, initial_audio, initial_video); - account = empathy_contact_get_account (contact); - req = tp_account_channel_request_new (account, request, timestamp); - tp_account_channel_request_create_channel_async (req, EMPATHY_AV_BUS_NAME, - NULL, create_media_channel_cb, NULL); + tp_account_channel_request_create_channel_async (req, EMPATHY_AV_BUS_NAME, NULL, + create_streamed_media_channel_cb, + NULL); g_hash_table_unref (request); g_object_unref (req); +#endif } const gchar * diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h index 157569453..aa2786c73 100644 --- a/libempathy/empathy-utils.h +++ b/libempathy/empathy-utils.h @@ -67,13 +67,16 @@ xmlNodePtr empathy_xml_node_find_child_prop_value (xmlNodePtr node, const gchar *prop_value); /* Calls */ -void empathy_call_new_with_streams (EmpathyContact *contact, - gboolean initial_audio, - gboolean initial_video, - gint64 timestamp); -GHashTable * empathy_call_create_streamed_media_request (EmpathyContact *contact, - gboolean initial_audio, - gboolean initial_video); +void empathy_call_new_with_streams (EmpathyContact *contact, + gboolean initial_audio, + gboolean initial_video, + gint64 timestamp); +GHashTable * empathy_call_create_call_request (EmpathyContact *contact, + gboolean initial_audio, + gboolean initial_video); +GHashTable * empathy_call_create_streamed_media_request (EmpathyContact *contact, + gboolean initial_audio, + gboolean initial_video); /* Others */ const gchar * empathy_presence_get_default_message (TpConnectionPresenceType presence); -- cgit antw44/cgit/cgit.cgi/freebsd-ports-gnome/diff/net/nxproxy?h=gnome-3.28&id=57543cd7cf14bfaaf93a4837ba8b8e8ba615bdcc'>diffstats
path: root/net/nxproxy
Commit message (Expand)AuthorAgeFilesLines
* Update to 3.5.0.32bapt2015-07-052-5/+6
* Update to 3.5.0.31bapt2015-03-182-3/+3
* Update to 3.5.0.30bapt2015-03-152-3/+3
* Update to 3.5.0.28bapt2014-11-172-3/+3
* Update to 3.5.0.27bapt2014-09-105-97/+12
* - Remove the indefinite article from COMMENTdanilo2013-10-121-20/+26
* Add NO_STAGE all over the place in preparation for the staging support (cat: ...bapt2013-09-211-4/+2
* - Use single space after WWW:sunpoet2013-08-291-1/+1
* Drop maintainership, a new version (3.5.0) has been released two years ago,arved2013-05-171-1/+1
* - update png to 1.5.10dinoex2012-06-012-2/+14
* Mark as broken on powerpc-9: fails to link.linimon2011-11-111-0/+4
* Teach configure about clangarved2011-06-212-3/+28
* - Get Rid MD5 supportmiwi2011-03-201-2/+0
* Move setsid from x2goclient-cli to nxproxy in preperation for upcoming qt x2g...arved2010-08-172-1/+11
* Unbreak on 6.xarved2010-08-151-4/+3
* - Mark BROKEN on 6.X: does not compilepav2010-07-241-1/+7