diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c index 531f4542e..6833fba82 100644 --- a/coreapi/callbacks.c +++ b/coreapi/callbacks.c @@ -271,7 +271,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=(char*)details; + const char *msg=details; LinphoneCall *call=lc->call; if (sal_op_get_user_pointer(op)!=lc->call){ @@ -281,11 +281,13 @@ static void call_failure(SalOp *op, SalError error, SalReason sr, const char *de if (lc->vtable.show) lc->vtable.show(lc); if (error==SalErrorNoResponse){ + msg=_("No response."); if (lc->vtable.display_status) - lc->vtable.display_status(lc,_("No response.")); + lc->vtable.display_status(lc,msg); }else if (error==SalErrorProtocol){ + msg=details ? details : _("Protocol error."); if (lc->vtable.display_status) - lc->vtable.display_status(lc, details ? details : _("Protocol error.")); + lc->vtable.display_status(lc, msg); }else if (error==SalErrorFailure){ switch(sr){ case SalReasonDeclined: @@ -336,7 +338,7 @@ static void call_failure(SalOp *op, SalError error, SalReason sr, const char *de if (call!=NULL) { linphone_call_destroy(call); if (sr!=SalReasonDeclined) gstate_new_state(lc, GSTATE_CALL_ERROR, msg); - else gstate_new_state(lc, GSTATE_CALL_END, NULL); + else gstate_new_state(lc, GSTATE_CALL_END, msg); lc->call=NULL; } } diff --git a/mediastreamer2 b/mediastreamer2 index c80d82259..44d29b3dc 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit c80d82259504474f8742577d2e0ebb1c58f589b4 +Subproject commit 44d29b3dcc1261f9999dfd6d02f86ccee0a18873 diff --git a/po/POTFILES.in b/po/POTFILES.in index 2ca5440ea..2b0f2734f 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -71,4 +71,4 @@ mediastreamer2/src/drawdib-display.c mediastreamer2/src/audiomixer.c mediastreamer2/src/chanadapt.c mediastreamer2/src/itc.c - +mediastreamer2/src/extdisplay.c