[empathy/gnome-2-34] empathy_call_new_with_streams: prefer StreamedMedia over Call

[Sjoerd Simons <sjoerds src gnome org>]

commit 0b12f2094066c4697b5eb151f30a186772b8447a
Author: Emilio Pozuelo Monfort <emilio pozuelo collabora co uk>
Date:   Wed Feb 23 16:24:53 2011 +0000

    empathy_call_new_with_streams: prefer StreamedMedia over Call

 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 9800a74..86ce3b4 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);
 }