Merge branch 'Impyy-fix-english'

This commit is contained in:
irungentoo 2014-11-25 18:29:00 -05:00
commit 00b511ed98
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
2 changed files with 3 additions and 3 deletions

View File

@ -580,7 +580,7 @@ int toxav_get_peer_id ( ToxAv *av, int32_t call_index, int peer )
ToxAvCallState toxav_get_call_state(ToxAv *av, int32_t call_index)
{
if ( cii(call_index, av->msi_session) || !av->msi_session->calls[call_index] )
return av_CallNonExistant;
return av_CallNonExistent;
return av->msi_session->calls[call_index]->state;

View File

@ -69,12 +69,12 @@ typedef enum {
typedef enum {
av_CallNonExistant = -1,
av_CallNonExistent = -1,
av_CallInviting, /* when sending call invite */
av_CallStarting, /* when getting call invite */
av_CallActive,
av_CallHold,
av_CallHanged_up
av_CallHungUp
} ToxAvCallState;
/**