diff options
author | iphydf <iphydf@users.noreply.github.com> | 2018-07-19 21:34:50 +0000 |
---|---|---|
committer | iphydf <iphydf@users.noreply.github.com> | 2018-08-11 13:12:49 +0000 |
commit | 678720d2fe1d2d7c96188e09c8f01e1335236013 (patch) | |
tree | 43191c8b4ba85a38dd7cc80d1aa59fbbe0026069 /toxcore/tox.c | |
parent | 463cbcb19a68bc4109285872258d494332bdeaf6 (diff) |
Split out conference type (text/av) from identifier.
Diffstat (limited to 'toxcore/tox.c')
-rw-r--r-- | toxcore/tox.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/toxcore/tox.c b/toxcore/tox.c index bf84f022..f7bdba79 100644 --- a/toxcore/tox.c +++ b/toxcore/tox.c | |||
@@ -1719,7 +1719,7 @@ Tox_Conference_Type tox_conference_get_type(const Tox *tox, uint32_t conference_ | |||
1719 | 1719 | ||
1720 | bool tox_conference_get_id(const Tox *tox, uint32_t conference_number, uint8_t *id /* TOX_CONFERENCE_ID_SIZE bytes */) | 1720 | bool tox_conference_get_id(const Tox *tox, uint32_t conference_number, uint8_t *id /* TOX_CONFERENCE_ID_SIZE bytes */) |
1721 | { | 1721 | { |
1722 | return conference_get_uid((Group_Chats *)tox->m->conferences_object, conference_number, id); | 1722 | return conference_get_id((Group_Chats *)tox->m->conferences_object, conference_number, id); |
1723 | } | 1723 | } |
1724 | 1724 | ||
1725 | // TODO(iphydf): Delete in 0.3.0. | 1725 | // TODO(iphydf): Delete in 0.3.0. |
@@ -1735,7 +1735,7 @@ uint32_t tox_conference_by_id(const Tox *tox, const uint8_t *id, Tox_Err_Confere | |||
1735 | return UINT32_MAX; | 1735 | return UINT32_MAX; |
1736 | } | 1736 | } |
1737 | 1737 | ||
1738 | int32_t ret = conference_by_uid((Group_Chats *)tox->m->conferences_object, id); | 1738 | int32_t ret = conference_by_id((Group_Chats *)tox->m->conferences_object, id); |
1739 | 1739 | ||
1740 | if (ret == -1) { | 1740 | if (ret == -1) { |
1741 | SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_BY_ID_NOT_FOUND); | 1741 | SET_ERROR_PARAMETER(error, TOX_ERR_CONFERENCE_BY_ID_NOT_FOUND); |