From 2b16115ebf7e8016ce61ddfef9399137d8c7208f Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Fri, 21 Oct 2011 12:05:28 +0200
Subject: [PATCH] fix bad merge (wasn't compiling)
---
coreapi/callbacks.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index c57016b97e..ed561c216b 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -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)");
}
--
GitLab