Commit c6a30537 authored by Simon Morlat's avatar Simon Morlat
Browse files

fix incorrectly named functions and compilation errors due to merge

parent f4a4a644
......@@ -2854,7 +2854,7 @@ int linphone_core_accept_early_media(LinphoneCore* lc, LinphoneCall* call){
int linphone_core_start_update_call(LinphoneCore *lc, LinphoneCall *call){
const char *subject;
bool_t no_user_consent=call->params.no_user_consent;
bool_t no_user_consent=call->params->no_user_consent;
if (!no_user_consent) linphone_call_make_local_media_description(lc,call);
#ifdef BUILD_UPNP
......
......@@ -1669,5 +1669,5 @@ uint8_t linphone_proxy_config_get_avpf_rr_interval(const LinphoneProxyConfig *cf
}
char* linphone_proxy_config_get_contact(const LinphoneProxyConfig *cfg) {
return sal_get_public_uri(cfg->op);
return sal_op_get_public_uri(cfg->op);
}
......@@ -735,9 +735,9 @@ belle_sip_stack_t *sal_get_belle_sip_stack(Sal *sal) {
return sal->stack;
}
char* sal_get_public_uri(SalOp *sal) {
if (sal&&sal->refresher) {
return belle_sip_refresher_get_public_uri(sal->refresher);
char* sal_op_get_public_uri(SalOp *op) {
if (op && op->refresher) {
return belle_sip_refresher_get_public_uri(op->refresher);
}
return NULL;
}
......@@ -757,5 +757,5 @@ int sal_body_has_type(const SalBody *body, const char *type, const char *subtype
int sal_lines_get_value(const char *data, const char *key, char *value, size_t value_size);
belle_sip_stack_t *sal_get_belle_sip_stack(Sal *sal);
char* sal_get_public_uri(SalOp *sal);
char* sal_op_get_public_uri(SalOp *sal);
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment