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 incorrectly named functions and compilation errors due to merge

Browse source
This commit is contained in:
Simon Morlat 2014-09-08 19:05:43 +02:00
parent f4a4a6440b
commit c6a3053756
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
coreapi/linphonecore.c
View file

@ -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

2
coreapi/proxy.c
View file

@ -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);
}

6
coreapi/sal.c
View file

@ -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;
}

2
include/sal/sal.h
View file

@ -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