#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
+#include <telepathy-glib/telepathy-glib-dbus.h>
#include "empathy-request-util.h"
gboolean initial_audio,
gboolean initial_video)
{
- return tp_asv_new (
+ GHashTable *asv = tp_asv_new (
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING,
TP_IFACE_CHANNEL_TYPE_CALL,
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_CALL_INITIAL_AUDIO, G_TYPE_BOOLEAN,
- initial_audio,
- TP_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, G_TYPE_BOOLEAN,
- initial_video,
NULL);
+
+ /* Only add InitialAudio or InitialVideo if they are 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);
+
+ return asv;
}
static void
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,
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,