Merge branch 'master' into dev_multicall

Conflicts:
	coreapi/callbacks.c
	coreapi/sal_eXosip2.c
	mediastreamer2

diff --cc coreapi/callbacks.c
index 31b5e723a900f81ab188bc3a56c4952e46ed3327,531f4542e9a7b41061e5dbda7c847b064da04d4a..8cb094121eb06f5e7071c4408a6fa70e7088371c
--- 1/coreapi/callbacks.c
--- 2/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@@ -145,9 -122,9 +145,10 @@@ static void call_ringing(SalOp *h)
        if (md==NULL){
                if (lc->ringstream!=NULL) return;       /*already ringing !*/
                if (lc->sound_conf.play_sndcard!=NULL){
 +                      MSSndCard *ringcard=lc->sound_conf.lsd_card ? lc->sound_conf.lsd_card : lc->sound_conf.play_sndcard;
                        ms_message("Remote ringing...");
 -                      lc->ringstream=ring_start(lc->sound_conf.remote_ring,2000,lc->sound_conf.play_sndcard);
 +                      lc->ringstream=ring_start(lc->sound_conf.remote_ring,2000,ringcard);
+                       gstate_new_state(lc, GSTATE_CALL_OUT_RINGING, NULL);
                }
        }else{
                /*accept early media */
@@@ -348,9 -271,13 +349,9 @@@ static void call_failure(SalOp *op, Sal
        /*char *retrymsg=_("%s. Retry after %i minute(s).");*/
        char *msg600=_("User does not want to be disturbed.");
        char *msg603=_("Call declined.");
-       char *msg=NULL;
+       char *msg=(char*)details;
 -      LinphoneCall *call=lc->call;
 +      LinphoneCall *call=(LinphoneCall*)sal_op_get_user_pointer(op);
  
 -      if (sal_op_get_user_pointer(op)!=lc->call){
 -              ms_warning("call_failure: ignoring.");
 -              return;
 -      }
        if (lc->vtable.show) lc->vtable.show(lc);
  
        if (error==SalErrorNoResponse){

diff --cc coreapi/linphonecore.h
Simple merge

diff --cc coreapi/sal_eXosip2.c
index 869d1934dc9f22be047ad61a250e2532521680c4,97cde63c25ff8e6121d055603f19f8da5e0e0b40..8214e251648e6c2133b84311022748527cf470da
--- 1/coreapi/sal_eXosip2.c
--- 2/coreapi/sal_eXosip2.c
+++ b/coreapi/sal_eXosip2.c
@@@ -1076,7 -1074,10 +1087,10 @@@ static bool_t call_failure(Sal *sal, eX
                                sr=SalReasonUnknown;
                        }else error=SalErrorNoResponse;
        }
 -      sal->callbacks.call_failure(op,error,sr,reason);
 +      sal->callbacks.call_failure(op,error,sr,reason,code);
+       if (computedReason != NULL){
+               ms_free(computedReason);
+       }
        return TRUE;
  }
  

diff --cc gtk-glade/incall_view.c
Simple merge

diff --cc gtk-glade/main.c
Simple merge