Commit c724a3fb authored by François Grisez's avatar François Grisez

Fix several compilation warnings caused by newly deprecated functions

parent 652f26cb
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
struct _LinphoneContactSearch{ struct _LinphoneContactSearch{
belle_sip_object_t base; belle_sip_object_t base;
ContactSearchID id; LinphoneContactSearchID id;
char* predicate; char* predicate;
ContactSearchCallback cb; ContactSearchCallback cb;
void* data; void* data;
......
...@@ -38,7 +38,7 @@ static void linphone_contact_search_destroy( LinphoneContactSearch* req) { ...@@ -38,7 +38,7 @@ static void linphone_contact_search_destroy( LinphoneContactSearch* req) {
if( req->predicate ) ms_free(req->predicate); if( req->predicate ) ms_free(req->predicate);
} }
ContactSearchID linphone_contact_search_get_id(LinphoneContactSearch* obj) LinphoneContactSearchID linphone_contact_search_get_id(LinphoneContactSearch* obj)
{ {
return obj->id; return obj->id;
} }
......
...@@ -1231,7 +1231,7 @@ static void certificates_config_read(LinphoneCore *lc) { ...@@ -1231,7 +1231,7 @@ static void certificates_config_read(LinphoneCore *lc) {
static void sip_config_read(LinphoneCore *lc) { static void sip_config_read(LinphoneCore *lc) {
char *contact; char *contact;
const char *tmpstr; const char *tmpstr;
LCSipTransports tr; LinphoneSipTransports tr;
int i,tmp; int i,tmp;
int ipv6_default = TRUE; int ipv6_default = TRUE;
...@@ -2557,7 +2557,7 @@ void linphone_core_set_use_rfc2833_for_dtmf(LinphoneCore *lc,bool_t use_rfc2833) ...@@ -2557,7 +2557,7 @@ void linphone_core_set_use_rfc2833_for_dtmf(LinphoneCore *lc,bool_t use_rfc2833)
} }
int linphone_core_get_sip_port(LinphoneCore *lc){ int linphone_core_get_sip_port(LinphoneCore *lc){
LCSipTransports tr; LinphoneSipTransports tr;
linphone_core_get_sip_transports_used(lc,&tr); linphone_core_get_sip_transports_used(lc,&tr);
return tr.udp_port>0 ? tr.udp_port : (tr.tcp_port > 0 ? tr.tcp_port : tr.tls_port); return tr.udp_port>0 ? tr.udp_port : (tr.tcp_port > 0 ? tr.tcp_port : tr.tls_port);
} }
...@@ -2592,7 +2592,7 @@ static void transport_error(LinphoneCore *lc, const char* transport, int port){ ...@@ -2592,7 +2592,7 @@ static void transport_error(LinphoneCore *lc, const char* transport, int port){
ms_free(msg); ms_free(msg);
} }
static bool_t transports_unchanged(const LCSipTransports * tr1, const LCSipTransports * tr2){ static bool_t transports_unchanged(const LinphoneSipTransports * tr1, const LinphoneSipTransports * tr2){
return return
tr2->udp_port==tr1->udp_port && tr2->udp_port==tr1->udp_port &&
tr2->tcp_port==tr1->tcp_port && tr2->tcp_port==tr1->tcp_port &&
...@@ -2614,7 +2614,7 @@ static void __linphone_core_invalidate_registers(LinphoneCore* lc){ ...@@ -2614,7 +2614,7 @@ static void __linphone_core_invalidate_registers(LinphoneCore* lc){
int _linphone_core_apply_transports(LinphoneCore *lc){ int _linphone_core_apply_transports(LinphoneCore *lc){
Sal *sal=lc->sal; Sal *sal=lc->sal;
const char *anyaddr; const char *anyaddr;
LCSipTransports *tr=&lc->sip_conf.transports; LinphoneSipTransports *tr=&lc->sip_conf.transports;
const char* listening_address; const char* listening_address;
/*first of all invalidate all current registrations so that we can register again with new transports*/ /*first of all invalidate all current registrations so that we can register again with new transports*/
__linphone_core_invalidate_registers(lc); __linphone_core_invalidate_registers(lc);
...@@ -2662,7 +2662,7 @@ bool_t linphone_core_sip_transport_supported(const LinphoneCore *lc, LinphoneTra ...@@ -2662,7 +2662,7 @@ bool_t linphone_core_sip_transport_supported(const LinphoneCore *lc, LinphoneTra
} }
int linphone_core_set_sip_transports(LinphoneCore *lc, const LCSipTransports * tr_config /*config to be saved*/){ int linphone_core_set_sip_transports(LinphoneCore *lc, const LCSipTransports * tr_config /*config to be saved*/){
LCSipTransports tr=*tr_config; LinphoneSipTransports tr=*tr_config;
if (lp_config_get_int(lc->config,"sip","sip_random_port",0)==1) { if (lp_config_get_int(lc->config,"sip","sip_random_port",0)==1) {
/*legacy random mode*/ /*legacy random mode*/
...@@ -2707,7 +2707,7 @@ void linphone_core_get_sip_transports_used(LinphoneCore *lc, LinphoneSipTranspor ...@@ -2707,7 +2707,7 @@ void linphone_core_get_sip_transports_used(LinphoneCore *lc, LinphoneSipTranspor
} }
void linphone_core_set_sip_port(LinphoneCore *lc,int port) { void linphone_core_set_sip_port(LinphoneCore *lc,int port) {
LCSipTransports tr; LinphoneSipTransports tr;
memset(&tr,0,sizeof(tr)); memset(&tr,0,sizeof(tr));
tr.udp_port=port; tr.udp_port=port;
linphone_core_set_sip_transports (lc,&tr); linphone_core_set_sip_transports (lc,&tr);
......
...@@ -1291,7 +1291,7 @@ void linphone_core_queue_task(LinphoneCore *lc, belle_sip_source_func_t task_fun ...@@ -1291,7 +1291,7 @@ void linphone_core_queue_task(LinphoneCore *lc, belle_sip_source_func_t task_fun
} }
static int get_unique_transport(LinphoneCore *lc, LinphoneTransportType *type, int *port){ static int get_unique_transport(LinphoneCore *lc, LinphoneTransportType *type, int *port){
LCSipTransports tp; LinphoneSipTransports tp;
linphone_core_get_sip_transports(lc,&tp); linphone_core_get_sip_transports(lc,&tp);
if (tp.tcp_port==0 && tp.tls_port==0 && tp.udp_port!=0){ if (tp.tcp_port==0 && tp.tls_port==0 && tp.udp_port!=0){
*type=LinphoneTransportUdp; *type=LinphoneTransportUdp;
...@@ -1341,7 +1341,7 @@ int linphone_core_migrate_to_multi_transport(LinphoneCore *lc){ ...@@ -1341,7 +1341,7 @@ int linphone_core_migrate_to_multi_transport(LinphoneCore *lc){
LinphoneTransportType tpt; LinphoneTransportType tpt;
int port; int port;
if (get_unique_transport(lc,&tpt,&port)==0){ if (get_unique_transport(lc,&tpt,&port)==0){
LCSipTransports newtp={0}; LinphoneSipTransports newtp={0};
if (lp_config_get_int(lc->config,"sip","sip_random_port",0)) if (lp_config_get_int(lc->config,"sip","sip_random_port",0))
port=-1; port=-1;
ms_message("Core is using a single SIP transport, migrating proxy config and enabling multi-transport."); ms_message("Core is using a single SIP transport, migrating proxy config and enabling multi-transport.");
......
...@@ -811,7 +811,7 @@ typedef struct sip_config ...@@ -811,7 +811,7 @@ typedef struct sip_config
int in_call_timeout; /*timeout after a call is hangup */ int in_call_timeout; /*timeout after a call is hangup */
int delayed_timeout; /*timeout after a delayed call is resumed */ int delayed_timeout; /*timeout after a delayed call is resumed */
unsigned int keepalive_period; /* interval in ms between keep alive messages sent to the proxy server*/ unsigned int keepalive_period; /* interval in ms between keep alive messages sent to the proxy server*/
LCSipTransports transports; LinphoneSipTransports transports;
bool_t guess_hostname; bool_t guess_hostname;
bool_t loopback_only; bool_t loopback_only;
bool_t ipv6_enabled; bool_t ipv6_enabled;
......
...@@ -688,7 +688,7 @@ char* linphone_proxy_config_normalize_phone_number(LinphoneProxyConfig *proxy, c ...@@ -688,7 +688,7 @@ char* linphone_proxy_config_normalize_phone_number(LinphoneProxyConfig *proxy, c
ms_free(flatten); ms_free(flatten);
} }
} }
if (proxy==NULL) linphone_proxy_config_destroy(tmpproxy); if (proxy==NULL) linphone_proxy_config_unref(tmpproxy);
return result; return result;
} }
......
...@@ -41,7 +41,7 @@ extern "C" { ...@@ -41,7 +41,7 @@ extern "C" {
* @deprecated Use LinphoneChatMessageCbsMsgStateChangedCb instead. * @deprecated Use LinphoneChatMessageCbsMsgStateChangedCb instead.
* @donotwrap * @donotwrap
*/ */
LINPHONE_DEPRECATED typedef void (*LinphoneChatMessageStateChangedCb)(LinphoneChatMessage* msg,LinphoneChatMessageState state,void* ud); typedef void (*LinphoneChatMessageStateChangedCb)(LinphoneChatMessage* msg,LinphoneChatMessageState state,void* ud);
/** /**
* Call back used to notify message delivery status * Call back used to notify message delivery status
......
...@@ -28,7 +28,7 @@ extern "C" { ...@@ -28,7 +28,7 @@ extern "C" {
/* LinphoneContactSearchRequest */ /* LinphoneContactSearchRequest */
void linphone_contact_search_init(LinphoneContactSearch *obj, const char *predicate, ContactSearchCallback cb, void *cb_data); void linphone_contact_search_init(LinphoneContactSearch *obj, const char *predicate, ContactSearchCallback cb, void *cb_data);
ContactSearchID linphone_contact_search_get_id(LinphoneContactSearch *obj); LinphoneContactSearchID linphone_contact_search_get_id(LinphoneContactSearch *obj);
const char* linphone_contact_search_get_predicate(LinphoneContactSearch *obj); const char* linphone_contact_search_get_predicate(LinphoneContactSearch *obj);
void linphone_contact_search_invoke_cb(LinphoneContactSearch *req, MSList *friends); void linphone_contact_search_invoke_cb(LinphoneContactSearch *req, MSList *friends);
LINPHONE_PUBLIC LinphoneContactSearch* linphone_contact_search_ref(void *obj); LINPHONE_PUBLIC LinphoneContactSearch* linphone_contact_search_ref(void *obj);
......
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