Commit 8e4aed08 authored by Simon Morlat's avatar Simon Morlat

fix compil errors and fix make distcheck

parent 2d031576
...@@ -203,10 +203,6 @@ void linphone_core_interpret_friend_uri(LinphoneCore *lc, const char *uri, char ...@@ -203,10 +203,6 @@ void linphone_core_interpret_friend_uri(LinphoneCore *lc, const char *uri, char
int linphone_friend_set_addr(LinphoneFriend *lf, const LinphoneAddress *addr){ int linphone_friend_set_addr(LinphoneFriend *lf, const LinphoneAddress *addr){
LinphoneAddress *fr=linphone_address_clone(addr); LinphoneAddress *fr=linphone_address_clone(addr);
if (fr==NULL) {
ms_warning("Invalid friend sip uri: %s",addr);
return -1;
}
linphone_address_clean(fr); linphone_address_clean(fr);
if (lf->uri!=NULL) linphone_address_destroy(lf->uri); if (lf->uri!=NULL) linphone_address_destroy(lf->uri);
lf->uri=fr; lf->uri=fr;
......
...@@ -1177,7 +1177,7 @@ void linphone_call_stop_media_streams(LinphoneCall *call){ ...@@ -1177,7 +1177,7 @@ void linphone_call_stop_media_streams(LinphoneCall *call){
const char *state_str=NULL; const char *state_str=NULL;
ms_filter_call_method(call->audiostream->ec,MS_ECHO_CANCELLER_GET_STATE_STRING,&state_str); ms_filter_call_method(call->audiostream->ec,MS_ECHO_CANCELLER_GET_STATE_STRING,&state_str);
if (state_str){ if (state_str){
ms_message("Writing echo canceller state, %i bytes",strlen(state_str)); ms_message("Writing echo canceller state, %i bytes",(int)strlen(state_str));
lp_config_set_string(call->core->config,"sound","ec_state",state_str); lp_config_set_string(call->core->config,"sound","ec_state",state_str);
} }
} }
......
...@@ -1431,7 +1431,7 @@ void linphone_core_set_user_agent(const char *name, const char *ver){ ...@@ -1431,7 +1431,7 @@ void linphone_core_set_user_agent(const char *name, const char *ver){
static void transport_error(LinphoneCore *lc, const char* transport, int port){ static void transport_error(LinphoneCore *lc, const char* transport, int port){
char *msg=ortp_strdup_printf("Could not start %s transport on port %i, maybe this port is already used.",transport,port); char *msg=ortp_strdup_printf("Could not start %s transport on port %i, maybe this port is already used.",transport,port);
ms_warning(msg); ms_warning("%s",msg);
if (lc->vtable.display_warning) if (lc->vtable.display_warning)
lc->vtable.display_warning(lc,msg); lc->vtable.display_warning(lc,msg);
ms_free(msg); ms_free(msg);
......
...@@ -747,7 +747,7 @@ LinphoneAccountCreator *linphone_account_creator_new(struct _LinphoneCore *core, ...@@ -747,7 +747,7 @@ LinphoneAccountCreator *linphone_account_creator_new(struct _LinphoneCore *core,
return NULL; return NULL;
} }
if (!(sip_setup_get_capabilities(ss) & SIP_SETUP_CAP_ACCOUNT_MANAGER)){ if (!(sip_setup_get_capabilities(ss) & SIP_SETUP_CAP_ACCOUNT_MANAGER)){
ms_error("%s cannot manage accounts."); ms_error("%s cannot manage accounts.",type);
return NULL; return NULL;
} }
obj=ms_new0(LinphoneAccountCreator,1); obj=ms_new0(LinphoneAccountCreator,1);
......
mediastreamer2 @ 37e59211
Subproject commit 40e4fefd4c76843f7d822c8013307cf230def10b Subproject commit 37e5921186a8591b7b63eaf517e4c44b8561f752
oRTP @ 5b231b8e
Subproject commit a4e50eedc1d6b6f8855d1c600b56b116e95c5060 Subproject commit 5b231b8e0b9d82ccb93463ef4c2c28e15d68ba76
...@@ -12,6 +12,7 @@ status-orange.png \ ...@@ -12,6 +12,7 @@ status-orange.png \
status-red.png \ status-red.png \
status-offline.png \ status-offline.png \
contact-orange.png dialer-orange.png history-orange.png\ contact-orange.png dialer-orange.png history-orange.png\
startcall-green.png stopcall-red.png addcall-green.png linphone.icns startcall-green.png stopcall-red.png addcall-green.png linphone.icns \
contact_starred.png contact_unstarred.png
EXTRA_DIST=$(pixmap_DATA) EXTRA_DIST=$(pixmap_DATA)
...@@ -30,4 +30,5 @@ coreapi/friend.c ...@@ -30,4 +30,5 @@ coreapi/friend.c
coreapi/proxy.c coreapi/proxy.c
coreapi/callbacks.c coreapi/callbacks.c
coreapi/sal_eXosip2.c coreapi/sal_eXosip2.c
coreapi/linphonecall.c
...@@ -44,4 +44,5 @@ mediastreamer2/src/winvideo.c ...@@ -44,4 +44,5 @@ mediastreamer2/src/winvideo.c
mediastreamer2/src/winvideo2.c mediastreamer2/src/winvideo2.c
mediastreamer2/src/winvideods.c mediastreamer2/src/winvideods.c
mediastreamer2/src/x11video.c mediastreamer2/src/x11video.c
mediastreamer2/src/vp8.c
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