mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-23 22:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix bad merge (wasn't compiling)

Browse source
This commit is contained in:
Simon Morlat 2011-10-21 12:05:28 +02:00
parent 7f7ee739c2
commit 2b16115ebf
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
coreapi/callbacks.c
View file

@ -397,6 +397,9 @@ static void call_updating(SalOp *op){
SalMediaDescription *md;
md=sal_call_get_final_media_description(op);
/*accept the modification (sends a 200Ok)*/
sal_call_accept(op);
if (md && !sal_media_description_empty(md))
{
@ -422,12 +425,7 @@ static void call_updating(SalOp *op){
linphone_call_set_state(call, LinphoneCallUpdatedByRemote,"Call updated by remote");
}
}
/*accept the modification (sends a 200Ok)*/
sal_call_accept(op);
<<<<<<< HEAD
=======
>>>>>>> 949b3cd84135d234abab27a023885ad977f715c9
if (prevstate!=LinphoneCallIdle){
linphone_call_set_state (call,prevstate,"Connected (streams running)");
}