empathy_call_new_with_streams: remove initial_audio arg

[empathy.git] / libempathy-gtk / empathy-call-utils.c

diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c
index 0689e78a7e3760ccb851976119fefe02df85734b..261205b0f71841a22c722a8b7f0384f3fdc3afe1 100644 (file)
--- a/libempathy-gtk/empathy-call-utils.c
+++ b/libempathy-gtk/empathy-call-utils.c
@@ -73,7 +73,6 @@ show_call_error (GError *error)
 
 GHashTable *
 empathy_call_create_call_request (const gchar *contact,
-    gboolean initial_audio,
     gboolean initial_video)
 {
   GHashTable *asv = tp_asv_new (
@@ -83,13 +82,12 @@ empathy_call_create_call_request (const gchar *contact,
       TP_HANDLE_TYPE_CONTACT,
     TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING,
       contact,
+    TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, G_TYPE_BOOLEAN,
+      TRUE,
     NULL);
 
-  /* Only add InitialAudio or InitialVideo if they are true: it should work
+  /* Only add InitialVideo if it is true: it should work
    * with genuinely voice-only CMs. */
-  if (initial_audio)
-    tp_asv_set_boolean (asv, TP_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO,
-                        initial_audio);
   if (initial_video)
     tp_asv_set_boolean (asv, TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO,
                         initial_video);
@@ -113,11 +111,9 @@ create_call_channel_cb (GObject *source,
   show_call_error (error);
 }
 
-/* Try to request a Call channel and fallback to StreamedMedia if that fails */
-static void
-call_new_with_streams (const gchar *contact,
+void
+empathy_call_new_with_streams (const gchar *contact,
     TpAccount *account,
-    gboolean initial_audio,
     gboolean initial_video,
     gint64 timestamp)
 {
@@ -125,31 +121,18 @@ call_new_with_streams (const gchar *contact,
   TpAccountChannelRequest *call_req;
 
   /* Call */
-  call_request = empathy_call_create_call_request (contact,
-      initial_audio,
-      initial_video);
+  call_request = empathy_call_create_call_request (contact, initial_video);
 
   call_req = tp_account_channel_request_new (account, call_request, timestamp);
 
   g_hash_table_unref (call_request);
 
   tp_account_channel_request_create_channel_async (call_req,
-      EMPATHY_CALL_BUS_NAME, NULL, create_call_channel_cb, NULL);
+      EMPATHY_CALL_TP_BUS_NAME, NULL, create_call_channel_cb, NULL);
 
   g_object_unref (call_req);
 }
 
-void
-empathy_call_new_with_streams (const gchar *contact,
-    TpAccount *account,
-    gboolean initial_audio,
-    gboolean initial_video,
-    gint64 timestamp)
-{
-  call_new_with_streams (contact, account, initial_audio, initial_video,
-      timestamp);
-}
-
 /* Copied from telepathy-yell call-channel.c */
 void
 empathy_call_channel_send_video (TpCallChannel *self,