From 02b192d6eec17742a96c49d7f8a11bfaa5561971 Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Fri, 25 Jul 2014 19:55:16 -0400 Subject: [PATCH] fix bug and typo --- src/help.c | 2 +- src/prompt.c | 2 -- src/toxic.c | 8 ++++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/help.c b/src/help.c index cbfdae3..ba8603c 100644 --- a/src/help.c +++ b/src/help.c @@ -181,7 +181,7 @@ static void help_draw_chat(ToxWindow *self) wprintw(win, " /call : Audio call\n"); wprintw(win, " /cancel : Cancel call\n"); - wprintw(win, " /answer : Answer incomming call\n"); + wprintw(win, " /answer : Answer incoming call\n"); wprintw(win, " /reject : Reject incoming call\n"); wprintw(win, " /hangup : Hangup active call\n"); wprintw(win, " /sdev : Change active device\n"); diff --git a/src/prompt.c b/src/prompt.c index ef19b2e..e6bbfc3 100644 --- a/src/prompt.c +++ b/src/prompt.c @@ -367,11 +367,9 @@ void prompt_init_statusbar(ToxWindow *self, Tox *m) char nick[TOX_MAX_NAME_LENGTH]; char statusmsg[MAX_STR_SIZE]; - pthread_mutex_lock(&Winthread.lock); uint16_t n_len = tox_get_self_name(m, (uint8_t *) nick); uint16_t s_len = tox_get_self_status_message(m, (uint8_t *) statusmsg, MAX_STR_SIZE); uint8_t status = tox_get_self_user_status(m); - pthread_mutex_unlock(&Winthread.lock); nick[n_len] = '\0'; statusmsg[s_len] = '\0'; diff --git a/src/toxic.c b/src/toxic.c index b1edff8..085f0bd 100644 --- a/src/toxic.c +++ b/src/toxic.c @@ -613,6 +613,7 @@ int main(int argc, char *argv[]) load_data(m, DATA_FILE); prompt = init_windows(m); + prompt_init_statusbar(prompt, m); /* thread for ncurses stuff */ if (pthread_mutex_init(&Winthread.lock, NULL) != 0) @@ -624,8 +625,8 @@ int main(int argc, char *argv[]) #ifdef _AUDIO av = init_audio(prompt, m); - - + + set_primary_device(input, user_settings_->audio_in_dev); set_primary_device(output, user_settings_->audio_out_dev); #elif _SOUND_NOTIFY @@ -640,7 +641,7 @@ int main(int argc, char *argv[]) notify(prompt, self_log_in, 0); #endif /* _SOUND_NOTIFY */ - char *msg; + const char *msg; if (config_err) { msg = "Unable to determine configuration directory. Defaulting to 'data' for a keyfile..."; @@ -653,7 +654,6 @@ int main(int argc, char *argv[]) } sort_friendlist_index(); - prompt_init_statusbar(prompt, m); uint64_t last_save = (uint64_t) time(NULL);