diff options
author | irungentoo <irungentoo@gmail.com> | 2014-11-25 18:29:00 -0500 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2014-11-25 18:29:00 -0500 |
commit | 00b511ed98b5abfb860f43682e893f23014f33b6 (patch) | |
tree | eb71f656fd3bfb2b571acd175f47c960bfe08d31 | |
parent | a7a225d1d6c37418c59cdd56357aa32d5464c787 (diff) | |
parent | 6cff9ecf73402259559de732a288efea67b65c0d (diff) |
Merge branch 'Impyy-fix-english'
-rw-r--r-- | toxav/toxav.c | 2 | ||||
-rw-r--r-- | toxav/toxav.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/toxav/toxav.c b/toxav/toxav.c index d7de0326..1aa4d6b4 100644 --- a/toxav/toxav.c +++ b/toxav/toxav.c | |||
@@ -580,7 +580,7 @@ int toxav_get_peer_id ( ToxAv *av, int32_t call_index, int peer ) | |||
580 | ToxAvCallState toxav_get_call_state(ToxAv *av, int32_t call_index) | 580 | ToxAvCallState toxav_get_call_state(ToxAv *av, int32_t call_index) |
581 | { | 581 | { |
582 | if ( cii(call_index, av->msi_session) || !av->msi_session->calls[call_index] ) | 582 | if ( cii(call_index, av->msi_session) || !av->msi_session->calls[call_index] ) |
583 | return av_CallNonExistant; | 583 | return av_CallNonExistent; |
584 | 584 | ||
585 | return av->msi_session->calls[call_index]->state; | 585 | return av->msi_session->calls[call_index]->state; |
586 | 586 | ||
diff --git a/toxav/toxav.h b/toxav/toxav.h index acee3f85..8d4db14a 100644 --- a/toxav/toxav.h +++ b/toxav/toxav.h | |||
@@ -69,12 +69,12 @@ typedef enum { | |||
69 | 69 | ||
70 | 70 | ||
71 | typedef enum { | 71 | typedef enum { |
72 | av_CallNonExistant = -1, | 72 | av_CallNonExistent = -1, |
73 | av_CallInviting, /* when sending call invite */ | 73 | av_CallInviting, /* when sending call invite */ |
74 | av_CallStarting, /* when getting call invite */ | 74 | av_CallStarting, /* when getting call invite */ |
75 | av_CallActive, | 75 | av_CallActive, |
76 | av_CallHold, | 76 | av_CallHold, |
77 | av_CallHanged_up | 77 | av_CallHungUp |
78 | } ToxAvCallState; | 78 | } ToxAvCallState; |
79 | 79 | ||
80 | /** | 80 | /** |