diff options
author | irungentoo <irungentoo@gmail.com> | 2013-08-13 07:39:04 -0400 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2013-08-13 07:39:04 -0400 |
commit | 8fe1dec5d634a2bba214b9204bda8341e8b26ed5 (patch) | |
tree | f1c74befeba8f73761fefd75f4e81890c76f305b | |
parent | d0cd78fbea8306f41f5387ad2a07f17464d79ac5 (diff) |
Fixed merge problem and set better default names.
-rw-r--r-- | testing/toxic/chat.c | 2 | ||||
-rw-r--r-- | testing/toxic/main.c | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c index 32c05dec..35be3bd3 100644 --- a/testing/toxic/chat.c +++ b/testing/toxic/chat.c | |||
@@ -181,7 +181,7 @@ static void chat_onKey(ToxWindow *self, Messenger *m, int key) | |||
181 | /* make sure the string has at least non-space character */ | 181 | /* make sure the string has at least non-space character */ |
182 | if (!string_is_empty(ctx->line)) { | 182 | if (!string_is_empty(ctx->line)) { |
183 | uint8_t selfname[MAX_NAME_LENGTH]; | 183 | uint8_t selfname[MAX_NAME_LENGTH]; |
184 | getself_name(m, selfname); | 184 | getself_name(m, selfname, sizeof(selfname)); |
185 | fix_name(selfname); | 185 | fix_name(selfname); |
186 | 186 | ||
187 | wattron(ctx->history, COLOR_PAIR(2)); | 187 | wattron(ctx->history, COLOR_PAIR(2)); |
diff --git a/testing/toxic/main.c b/testing/toxic/main.c index 8ef44012..40ff5d09 100644 --- a/testing/toxic/main.c +++ b/testing/toxic/main.c | |||
@@ -140,7 +140,13 @@ static void init_tox() | |||
140 | m_callback_namechange(m, on_nickchange, NULL); | 140 | m_callback_namechange(m, on_nickchange, NULL); |
141 | m_callback_statusmessage(m, on_statuschange, NULL); | 141 | m_callback_statusmessage(m, on_statuschange, NULL); |
142 | m_callback_action(m, on_action, NULL); | 142 | m_callback_action(m, on_action, NULL); |
143 | setname(m, (uint8_t*) "n00b", strlen("n00b")+1); | 143 | #ifdef __linux__ |
144 | setname(m, (uint8_t*) "Cool guy", sizeof("Cool guy")); | ||
145 | #elif WIN32 | ||
146 | setname(m, (uint8_t*) "I should install GNU/Linux", sizeof("I should install GNU/Linux")); | ||
147 | #else | ||
148 | setname(m, (uint8_t*) "Hipster", sizeof("Hipster")); | ||
149 | #endif | ||
144 | } | 150 | } |
145 | 151 | ||
146 | #define MAXLINE 90 /* Approx max number of chars in a sever line (IP + port + key) */ | 152 | #define MAXLINE 90 /* Approx max number of chars in a sever line (IP + port + key) */ |