From 8e4aed0888bf276330e4715c76484297a8faa607 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 19 Sep 2011 10:20:55 +0200 Subject: [PATCH] fix compil errors and fix make distcheck --- coreapi/friend.c | 4 ---- coreapi/linphonecall.c | 2 +- coreapi/linphonecore.c | 2 +- coreapi/proxy.c | 2 +- mediastreamer2 | 2 +- oRTP | 2 +- pixmaps/Makefile.am | 3 ++- po/POTFILES.in | 1 + po/POTFILES.skip | 1 + 9 files changed, 9 insertions(+), 10 deletions(-) diff --git a/coreapi/friend.c b/coreapi/friend.c index 03332d68..2afcc421 100644 --- a/coreapi/friend.c +++ b/coreapi/friend.c @@ -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){ LinphoneAddress *fr=linphone_address_clone(addr); - if (fr==NULL) { - ms_warning("Invalid friend sip uri: %s",addr); - return -1; - } linphone_address_clean(fr); if (lf->uri!=NULL) linphone_address_destroy(lf->uri); lf->uri=fr; diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c index 2f5ca46e..7f33de82 100644 --- a/coreapi/linphonecall.c +++ b/coreapi/linphonecall.c @@ -1177,7 +1177,7 @@ void linphone_call_stop_media_streams(LinphoneCall *call){ const char *state_str=NULL; ms_filter_call_method(call->audiostream->ec,MS_ECHO_CANCELLER_GET_STATE_STRING,&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); } } diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index d2ac2c52..22de34ae 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -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){ 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) lc->vtable.display_warning(lc,msg); ms_free(msg); diff --git a/coreapi/proxy.c b/coreapi/proxy.c index dda1bc78..ab5fd397 100644 --- a/coreapi/proxy.c +++ b/coreapi/proxy.c @@ -747,7 +747,7 @@ LinphoneAccountCreator *linphone_account_creator_new(struct _LinphoneCore *core, return NULL; } 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; } obj=ms_new0(LinphoneAccountCreator,1); diff --git a/mediastreamer2 b/mediastreamer2 index 40e4fefd..37e59211 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 40e4fefd4c76843f7d822c8013307cf230def10b +Subproject commit 37e5921186a8591b7b63eaf517e4c44b8561f752 diff --git a/oRTP b/oRTP index a4e50eed..5b231b8e 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit a4e50eedc1d6b6f8855d1c600b56b116e95c5060 +Subproject commit 5b231b8e0b9d82ccb93463ef4c2c28e15d68ba76 diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am index ec0b5ae3..8a920127 100644 --- a/pixmaps/Makefile.am +++ b/pixmaps/Makefile.am @@ -12,6 +12,7 @@ status-orange.png \ status-red.png \ status-offline.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) diff --git a/po/POTFILES.in b/po/POTFILES.in index af9a0602..ce473f9b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -30,4 +30,5 @@ coreapi/friend.c coreapi/proxy.c coreapi/callbacks.c coreapi/sal_eXosip2.c +coreapi/linphonecall.c diff --git a/po/POTFILES.skip b/po/POTFILES.skip index c965d6c4..d1c11e80 100755 --- a/po/POTFILES.skip +++ b/po/POTFILES.skip @@ -44,4 +44,5 @@ mediastreamer2/src/winvideo.c mediastreamer2/src/winvideo2.c mediastreamer2/src/winvideods.c mediastreamer2/src/x11video.c +mediastreamer2/src/vp8.c -- 2.39.2