diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-02-23 02:14:07 +0800 |
|---|---|---|
| committer | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2011-02-24 01:12:57 +0800 |
| commit | 43351bae1eb2f338922577ffa6dcc7321e35a37b (patch) | |
| tree | 2ff44c92b653e40d73a238cb26ca18887dec3148 /libempathy-gtk/empathy-call-utils.c | |
| parent | 10edf350020350475ece049d9c8fd969f70cf5c5 (diff) | |
| download | gsoc2013-empathy-43351bae1eb2f338922577ffa6dcc7321e35a37b.tar gsoc2013-empathy-43351bae1eb2f338922577ffa6dcc7321e35a37b.tar.gz gsoc2013-empathy-43351bae1eb2f338922577ffa6dcc7321e35a37b.tar.bz2 gsoc2013-empathy-43351bae1eb2f338922577ffa6dcc7321e35a37b.tar.lz gsoc2013-empathy-43351bae1eb2f338922577ffa6dcc7321e35a37b.tar.xz gsoc2013-empathy-43351bae1eb2f338922577ffa6dcc7321e35a37b.tar.zst gsoc2013-empathy-43351bae1eb2f338922577ffa6dcc7321e35a37b.zip | |
Don't require EmpathyContacts to start a call
Diffstat (limited to 'libempathy-gtk/empathy-call-utils.c')
| -rw-r--r-- | libempathy-gtk/empathy-call-utils.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/libempathy-gtk/empathy-call-utils.c b/libempathy-gtk/empathy-call-utils.c index d94e62400..d9c35e2cf 100644 --- a/libempathy-gtk/empathy-call-utils.c +++ b/libempathy-gtk/empathy-call-utils.c @@ -33,7 +33,7 @@ #if HAVE_CALL GHashTable * -empathy_call_create_call_request (EmpathyContact *contact, +empathy_call_create_call_request (const gchar *contact, gboolean initial_audio, gboolean initial_video) { @@ -42,8 +42,8 @@ empathy_call_create_call_request (EmpathyContact *contact, TPY_IFACE_CHANNEL_TYPE_CALL, TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT, - TP_PROP_CHANNEL_TARGET_HANDLE, G_TYPE_UINT, - empathy_contact_get_handle (contact), + TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, + contact, TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_AUDIO, G_TYPE_BOOLEAN, initial_audio, TPY_PROP_CHANNEL_TYPE_CALL_INITIAL_VIDEO, G_TYPE_BOOLEAN, @@ -53,7 +53,7 @@ empathy_call_create_call_request (EmpathyContact *contact, #endif GHashTable * -empathy_call_create_streamed_media_request (EmpathyContact *contact, +empathy_call_create_streamed_media_request (const gchar *contact, gboolean initial_audio, gboolean initial_video) { @@ -62,8 +62,8 @@ empathy_call_create_streamed_media_request (EmpathyContact *contact, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA, TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT, - TP_PROP_CHANNEL_TARGET_HANDLE, G_TYPE_UINT, - empathy_contact_get_handle (contact), + TP_PROP_CHANNEL_TARGET_ID, G_TYPE_STRING, + contact, TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_AUDIO, G_TYPE_BOOLEAN, initial_audio, TP_PROP_CHANNEL_TYPE_STREAMED_MEDIA_INITIAL_VIDEO, G_TYPE_BOOLEAN, @@ -118,14 +118,14 @@ create_call_channel_cb (GObject *source, #endif void -empathy_call_new_with_streams (EmpathyContact *contact, +empathy_call_new_with_streams (const gchar *contact, + TpAccount *account, gboolean initial_audio, gboolean initial_video, gint64 timestamp) { #if HAVE_CALL GHashTable *call_request, *streamed_media_request; - TpAccount *account; TpAccountChannelRequest *call_req, *streamed_media_req; call_request = empathy_call_create_call_request (contact, @@ -135,8 +135,6 @@ empathy_call_new_with_streams (EmpathyContact *contact, streamed_media_request = empathy_call_create_streamed_media_request ( contact, initial_audio, initial_video); - account = empathy_contact_get_account (contact); - call_req = tp_account_channel_request_new (account, call_request, timestamp); streamed_media_req = tp_account_channel_request_new (account, streamed_media_request, |