fix compil errors and fix make distcheck

diff --git a/coreapi/friend.c b/coreapi/friend.c
index 03332d689f4b9b23008ab27c0c5c320f04f7103b..2afcc4217798931d18fb37f352c42351c73225b7 100644 (file)
--- 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 2f5ca46ec4f52723095fccf0db3eac7c66934463..7f33de82866820cf127ffba275a9af4a95567432 100644 (file)
--- 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 d2ac2c5248a81710c85885135b5b8a1d0305cc13..22de34ae402fa20d1ab45b522444fba8468d81f8 100644 (file)
--- 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 dda1bc7890445b082d2891a4db9cf377b4de7e52..ab5fd39771581cf632a7a534f8694c2ce9de77cb 100644 (file)
--- 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 40e4fefd4c76843f7d822c8013307cf230def10b..37e5921186a8591b7b63eaf517e4c44b8561f752 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 40e4fefd4c76843f7d822c8013307cf230def10b
+Subproject commit 37e5921186a8591b7b63eaf517e4c44b8561f752

diff --git a/oRTP b/oRTP
index a4e50eedc1d6b6f8855d1c600b56b116e95c5060..5b231b8e0b9d82ccb93463ef4c2c28e15d68ba76 160000 (submodule)
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit a4e50eedc1d6b6f8855d1c600b56b116e95c5060
+Subproject commit 5b231b8e0b9d82ccb93463ef4c2c28e15d68ba76

diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index ec0b5ae3c9a58d06d50295d940d403d1f57ca0e8..8a9201275903f62d44537cc9fb78cb324ede78c9 100644 (file)
--- 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 af9a0602eda701c954a34d0a2d0f13c7be5eb0d7..ce473f9be37c8b635edc26594bf808d7f1868bbd 100644 (file)
--- 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 c965d6c490d434261b4548f1be99b39b5d5c18e6..d1c11e80e7ce12b108db045c9e41d2c94cc3d203 100755 (executable)
--- 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