diff options
author | irungentoo <irungentoo@gmail.com> | 2014-03-18 20:02:50 -0400 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2014-03-18 20:02:50 -0400 |
commit | 5770a0e29ab35efb1ef656ab81c499635fc5fecf (patch) | |
tree | 7b28f3f181dcb37c5b137759398c3ba1aeb95b8f /testing/nTox.c | |
parent | 6f0f3632c08e317493a85160b54361f64106fd63 (diff) | |
parent | 5babb281c05a48c0b4bbfe3c6be1527f439beec2 (diff) |
Merge branch 'api-fix'
Main changes:
1. Strings no longer need to be NULL terminated.
2. tox_get_friend_id is now named tox_get_friend_number.
3. The friend request callback function is now (Tox *tox, uint8_t *,
uint8_t *, uint16_t, void *), the Tox object pointer has been added to
it.
Diffstat (limited to 'testing/nTox.c')
-rw-r--r-- | testing/nTox.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testing/nTox.c b/testing/nTox.c index 9d3eb9c0..b99bf052 100644 --- a/testing/nTox.c +++ b/testing/nTox.c | |||
@@ -862,7 +862,7 @@ void do_refresh() | |||
862 | refresh(); | 862 | refresh(); |
863 | } | 863 | } |
864 | 864 | ||
865 | void print_request(uint8_t *public_key, uint8_t *data, uint16_t length, void *userdata) | 865 | void print_request(Tox *m, uint8_t *public_key, uint8_t *data, uint16_t length, void *userdata) |
866 | { | 866 | { |
867 | new_lines("[i] received friend request with message:"); | 867 | new_lines("[i] received friend request with message:"); |
868 | new_lines((char *)data); | 868 | new_lines((char *)data); |
@@ -1243,7 +1243,7 @@ int main(int argc, char *argv[]) | |||
1243 | 1243 | ||
1244 | new_lines("[i] change username with /n"); | 1244 | new_lines("[i] change username with /n"); |
1245 | uint8_t name[TOX_MAX_NAME_LENGTH + 1]; | 1245 | uint8_t name[TOX_MAX_NAME_LENGTH + 1]; |
1246 | uint16_t namelen = tox_get_self_name(m, name, sizeof(name)); | 1246 | uint16_t namelen = tox_get_self_name(m, name); |
1247 | name[namelen] = 0; | 1247 | name[namelen] = 0; |
1248 | 1248 | ||
1249 | if (namelen > 0) { | 1249 | if (namelen > 0) { |