aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk/empathy-call-utils.c
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-05-02 22:01:24 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2012-05-02 22:22:55 +0800
commit2d19fc2f3bc163cf742469185d61e667b2dcd084 (patch)
treec0982b3052be41ac57ec293b4c417ba4c287879d /libempathy-gtk/empathy-call-utils.c
parent5a6db15dbaaa9f3aa902d5ae2299bdb5ee83a9d8 (diff)
downloadgsoc2013-empathy-2d19fc2f3bc163cf742469185d61e667b2dcd084.tar
gsoc2013-empathy-2d19fc2f3bc163cf742469185d61e667b2dcd084.tar.gz
gsoc2013-empathy-2d19fc2f3bc163cf742469185d61e667b2dcd084.tar.bz2
gsoc2013-empathy-2d19fc2f3bc163cf742469185d61e667b2dcd084.tar.lz
gsoc2013-empathy-2d19fc2f3bc163cf742469185d61e667b2dcd084.tar.xz
gsoc2013-empathy-2d19fc2f3bc163cf742469185d61e667b2dcd084.tar.zst
gsoc2013-empathy-2d19fc2f3bc163cf742469185d61e667b2dcd084.zip
remove empathy-av
https://bugzilla.gnome.org/show_bug.cgi?id=675296
Diffstat (limited to 'libempathy-gtk/empathy-call-utils.c')
-rw-r--r--libempathy-gtk/empathy-call-utils.c31
1 files changed, 14 insertions, 17 deletions
diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c
index 545ec7ce8..1dca38645 100644
--- a/libempathy-gtk/empathy-call-utils.c
+++ b/libempathy-gtk/empathy-call-utils.c
@@ -143,24 +143,24 @@ create_call_channel_cb (GObject *source,
if (tp_account_channel_request_create_channel_finish (
TP_ACCOUNT_CHANNEL_REQUEST (source), result, &error))
{
- g_clear_object (&streamed_media_req);
+ g_object_unref (streamed_media_req);
return;
}
DEBUG ("Failed to create Call channel: %s", error->message);
- if (streamed_media_req != NULL)
+ if (error->code != TP_ERROR_NOT_IMPLEMENTED)
{
- 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);
return;
}
- show_call_error (error);
+ 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);
}
/* Try to request a Call channel and fallback to StreamedMedia if that fails */
@@ -171,11 +171,8 @@ call_new_with_streams (const gchar *contact,
gboolean initial_video,
gint64 timestamp)
{
- GHashTable *call_request;
- TpAccountChannelRequest *call_req, *streamed_media_req = NULL;
-#ifdef HAVE_EMPATHY_AV
- GHashTable *streamed_media_request;
-#endif
+ GHashTable *call_request, *streamed_media_request;
+ TpAccountChannelRequest *call_req, *streamed_media_req;
/* Call */
call_request = empathy_call_create_call_request (contact,
@@ -186,7 +183,6 @@ call_new_with_streams (const gchar *contact,
g_hash_table_unref (call_request);
-#ifdef HAVE_EMPATHY_AV
/* StreamedMedia */
streamed_media_request = empathy_call_create_streamed_media_request (
contact, initial_audio, initial_video);
@@ -196,10 +192,11 @@ call_new_with_streams (const gchar *contact,
timestamp);
g_hash_table_unref (streamed_media_request);
-#endif
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,
+ streamed_media_req);
g_object_unref (call_req);
}