diff options
author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-02-24 00:24:53 +0800 |
---|---|---|
committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2011-02-24 01:13:20 +0800 |
commit | 0b12f2094066c4697b5eb151f30a186772b8447a (patch) | |
tree | 45bd476b549343e0e4edff6c40f6058445b0a7e6 /libempathy-gtk | |
parent | efb08036e134b31339e0e422ef68e6ddef2bf467 (diff) | |
download | gsoc2013-empathy-0b12f2094066c4697b5eb151f30a186772b8447a.tar gsoc2013-empathy-0b12f2094066c4697b5eb151f30a186772b8447a.tar.gz gsoc2013-empathy-0b12f2094066c4697b5eb151f30a186772b8447a.tar.bz2 gsoc2013-empathy-0b12f2094066c4697b5eb151f30a186772b8447a.tar.lz gsoc2013-empathy-0b12f2094066c4697b5eb151f30a186772b8447a.tar.xz gsoc2013-empathy-0b12f2094066c4697b5eb151f30a186772b8447a.tar.zst gsoc2013-empathy-0b12f2094066c4697b5eb151f30a186772b8447a.zip |
empathy_call_new_with_streams: prefer StreamedMedia over Call
Diffstat (limited to 'libempathy-gtk')
-rw-r--r-- | libempathy-gtk/empathy-call-utils.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c index 9800a7403..86ce3b4f7 100644 --- a/libempathy-gtk/empathy-call-utils.c +++ b/libempathy-gtk/empathy-call-utils.c @@ -88,7 +88,7 @@ empathy_call_create_streamed_media_request (const gchar *contact, } static void -create_streamed_media_channel_cb (GObject *source, +create_call_channel_cb (GObject *source, GAsyncResult *result, gpointer user_data) { @@ -99,28 +99,28 @@ create_streamed_media_channel_cb (GObject *source, result, &error)) { - DEBUG ("Failed to create StreamedMedia channel: %s", error->message); + DEBUG ("Failed to create Call channel: %s", error->message); show_call_error (error); g_error_free (error); } } static void -create_call_channel_cb (GObject *source, +create_streamed_media_channel_cb (GObject *source, GAsyncResult *result, gpointer user_data) { - TpAccountChannelRequest *streamed_media_req = user_data; + TpAccountChannelRequest *call_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); + g_object_unref (call_req); return; } - DEBUG ("Failed to create Call channel: %s", error->message); + DEBUG ("Failed to create StreamedMedia channel: %s", error->message); if (error->code != TP_ERROR_NOT_IMPLEMENTED) { @@ -128,10 +128,10 @@ create_call_channel_cb (GObject *source, return; } - DEBUG ("Let's try with an StreamedMedia channel"); + DEBUG ("Let's try with a Call channel"); g_error_free (error); - tp_account_channel_request_create_channel_async (streamed_media_req, NULL, NULL, - create_streamed_media_channel_cb, + tp_account_channel_request_create_channel_async (call_req, NULL, NULL, + create_call_channel_cb, NULL); } @@ -157,11 +157,11 @@ empathy_call_new_with_streams (const gchar *contact, streamed_media_request, timestamp); - tp_account_channel_request_create_channel_async (call_req, NULL, NULL, - create_call_channel_cb, - streamed_media_req); + tp_account_channel_request_create_channel_async (streamed_media_req, NULL, NULL, + create_streamed_media_channel_cb, + call_req); g_hash_table_unref (call_request); g_hash_table_unref (streamed_media_request); - g_object_unref (call_req); + g_object_unref (streamed_media_req); } |