aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-05-02 22:03:11 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-05-02 22:22:55 +0800
commit59ec941bf710736869384acf3cfe137a6d1180a9 (patch)
tree7b1253cdd7e2d4a6d566c09a5635dde2909a9bff /libempathy-gtk
parent2d19fc2f3bc163cf742469185d61e667b2dcd084 (diff)
downloadgsoc2013-empathy-59ec941bf710736869384acf3cfe137a6d1180a9.tar
gsoc2013-empathy-59ec941bf710736869384acf3cfe137a6d1180a9.tar.gz
gsoc2013-empathy-59ec941bf710736869384acf3cfe137a6d1180a9.tar.bz2
gsoc2013-empathy-59ec941bf710736869384acf3cfe137a6d1180a9.tar.lz
gsoc2013-empathy-59ec941bf710736869384acf3cfe137a6d1180a9.tar.xz
gsoc2013-empathy-59ec941bf710736869384acf3cfe137a6d1180a9.tar.zst
gsoc2013-empathy-59ec941bf710736869384acf3cfe137a6d1180a9.zip
Revert "Revert "Stop requesting StreamedMedia channels""
This reverts commit 758b4250e767d9e952b8c0ea4db7d93df192a0c0. https://bugzilla.gnome.org/show_bug.cgi?id=675296
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-call-utils.c74
-rw-r--r--libempathy-gtk/empathy-call-utils.h4
2 files changed, 5 insertions, 73 deletions
diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c
index 1dca38645..77fdb565a 100644
--- a/libempathy-gtk/empathy-call-utils.c
+++ b/libempathy-gtk/empathy-call-utils.c
@@ -95,72 +95,20 @@ empathy_call_create_call_request (const gchar *contact,
NULL);
}
-GHashTable *
-empathy_call_create_streamed_media_request (const gchar *contact,
- gboolean initial_audio,
- gboolean initial_video)
-{
- return 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,
- TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING,
- contact,
- TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_AUDIO, G_TYPE_BOOLEAN,
- initial_audio,
- TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_VIDEO, G_TYPE_BOOLEAN,
- initial_video,
- NULL);
-}
-
-static void
-create_streamed_media_channel_cb (GObject *source,
- GAsyncResult *result,
- gpointer user_data)
-{
- GError *error = NULL;
-
- if (!tp_account_channel_request_create_channel_finish (
- TP_ACCOUNT_CHANNEL_REQUEST (source),
- result,
- &error))
- {
- DEBUG ("Failed to create StreamedMedia channel: %s", error->message);
- show_call_error (error);
- g_error_free (error);
- }
-}
-
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;
- }
+ return;
DEBUG ("Failed to create Call channel: %s", error->message);
- if (error->code != TP_ERROR_NOT_IMPLEMENTED)
- {
- show_call_error (error);
- return;
- }
-
- 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);
+ show_call_error (error);
}
/* Try to request a Call channel and fallback to StreamedMedia if that fails */
@@ -171,8 +119,8 @@ call_new_with_streams (const gchar *contact,
gboolean initial_video,
gint64 timestamp)
{
- GHashTable *call_request, *streamed_media_request;
- TpAccountChannelRequest *call_req, *streamed_media_req;
+ GHashTable *call_request;
+ TpAccountChannelRequest *call_req;
/* Call */
call_request = empathy_call_create_call_request (contact,
@@ -183,20 +131,8 @@ call_new_with_streams (const gchar *contact,
g_hash_table_unref (call_request);
- /* StreamedMedia */
- streamed_media_request = empathy_call_create_streamed_media_request (
- contact, initial_audio, initial_video);
-
- streamed_media_req = tp_account_channel_request_new (account,
- streamed_media_request,
- timestamp);
-
- g_hash_table_unref (streamed_media_request);
-
tp_account_channel_request_create_channel_async (call_req,
- EMPATHY_CALL_BUS_NAME, NULL,
- create_call_channel_cb,
- streamed_media_req);
+ EMPATHY_CALL_BUS_NAME, NULL, create_call_channel_cb, NULL);
g_object_unref (call_req);
}
diff --git a/libempathy-gtk/empathy-call-utils.h b/libempathy-gtk/empathy-call-utils.h
index 99e4ecf91..6d78908b8 100644
--- a/libempathy-gtk/empathy-call-utils.h
+++ b/libempathy-gtk/empathy-call-utils.h
@@ -36,10 +36,6 @@ GHashTable * empathy_call_create_call_request (const gchar *contact,
gboolean initial_audio,
gboolean initial_video);
-GHashTable * empathy_call_create_streamed_media_request (const gchar *contact,
- gboolean initial_audio,
- gboolean initial_video);
-
void empathy_call_set_stream_properties (GstElement *element,
gboolean echo_cancellation);