diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-02-23 02:14:07 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-06-09 17:20:05 +0800 |
| commit | 5e797f1df68283302038c9723604c87f476a0656 (patch) | |
| tree | ce3b7c3d4e7898897de6ba140611575315fdf83a /src | |
| parent | 0754b2673f0189e892074189535d3dfb6fd2a662 (diff) | |
| download | gsoc2013-empathy-5e797f1df68283302038c9723604c87f476a0656.tar gsoc2013-empathy-5e797f1df68283302038c9723604c87f476a0656.tar.gz gsoc2013-empathy-5e797f1df68283302038c9723604c87f476a0656.tar.bz2 gsoc2013-empathy-5e797f1df68283302038c9723604c87f476a0656.tar.lz gsoc2013-empathy-5e797f1df68283302038c9723604c87f476a0656.tar.xz gsoc2013-empathy-5e797f1df68283302038c9723604c87f476a0656.tar.zst gsoc2013-empathy-5e797f1df68283302038c9723604c87f476a0656.zip | |
Don't require EmpathyContacts to start a call
Conflicts:
libempathy-gtk/empathy-contact-menu.c
libempathy-gtk/empathy-individual-menu.c
libempathy-gtk/empathy-new-call-dialog.c
Diffstat (limited to 'src')
| -rw-r--r-- | src/empathy-call-factory.c | 3 | ||||
| -rw-r--r-- | src/empathy-streamed-media-handler.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/empathy-call-factory.c b/src/empathy-call-factory.c index 660a743bb..0bae03a0c 100644 --- a/src/empathy-call-factory.c +++ b/src/empathy-call-factory.c @@ -240,7 +240,8 @@ empathy_call_factory_new_call_with_streams (EmpathyContact *contact, TpAccount *account; TpAccountChannelRequest *call_req; - call_request = empathy_call_create_call_request (contact, + call_request = empathy_call_create_call_request ( + empathy_contact_get_id (contact), initial_audio, initial_video); account = empathy_contact_get_account (contact); diff --git a/src/empathy-streamed-media-handler.c b/src/empathy-streamed-media-handler.c index 9d533b993..39e3e560d 100644 --- a/src/empathy-streamed-media-handler.c +++ b/src/empathy-streamed-media-handler.c @@ -808,7 +808,8 @@ empathy_streamed_media_handler_start_call (EmpathyStreamedMediaHandler *handler, g_assert (priv->contact != NULL); account = empathy_contact_get_account (priv->contact); - request = empathy_call_create_streamed_media_request (priv->contact, + request = empathy_call_create_streamed_media_request ( + empathy_contact_get_id (priv->contact), priv->initial_audio, priv->initial_video); req = tp_account_channel_request_new (account, request, timestamp); |