From 5e797f1df68283302038c9723604c87f476a0656 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Tue, 22 Feb 2011 18:14:07 +0000 Subject: 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 --- src/empathy-call-factory.c | 3 ++- src/empathy-streamed-media-handler.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'src') 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); -- cgit v1.2.3