Merge branch 'master' into dev_multicall

[linphone] / coreapi / callbacks.c

diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index 31b5e723a900f81ab188bc3a56c4952e46ed3327..8cb094121eb06f5e7071c4408a6fa70e7088371c 100644 (file)
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -148,6 +148,7 @@ static void call_ringing(SalOp *h){
                        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,ringcard);
+                       gstate_new_state(lc, GSTATE_CALL_OUT_RINGING, NULL);
                }
        }else{
                /*accept early media */
@@ -161,7 +162,7 @@ static void call_ringing(SalOp *h){
                if (lc->vtable.show) lc->vtable.show(lc);
                if (lc->vtable.display_status) 
                        lc->vtable.display_status(lc,_("Early media."));
-               gstate_new_state(lc, GSTATE_CALL_OUT_CONNECTED, NULL);
+               gstate_new_state(lc, GSTATE_CALL_OUT_RINGING, NULL);
                if (lc->ringstream!=NULL){
                        ring_stop(lc->ringstream);
                        lc->ringstream=NULL;
@@ -348,7 +349,7 @@ static void call_failure(SalOp *op, SalError error, SalReason sr, const char *de
        /*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=(LinphoneCall*)sal_op_get_user_pointer(op);
 
        if (lc->vtable.show) lc->vtable.show(lc);