From 1e92bb3c2b5f933a4bd914a6d7dfebc1794c5ca0 Mon Sep 17 00:00:00 2001 From: Loui Chang Date: Thu, 14 Aug 2014 05:02:57 -0400 Subject: [PATCH 1/3] help: lowercase keybinding hints for clarity. Seeing the uppercase character I expected it to be the actual key. Signed-off-by: Loui Chang --- src/friendlist.c | 2 +- src/help.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/friendlist.c b/src/friendlist.c index e9723e4..eab45be 100644 --- a/src/friendlist.c +++ b/src/friendlist.c @@ -819,7 +819,7 @@ static void friendlist_onDraw(ToxWindow *self, Tox *m) wattron(self->window, COLOR_PAIR(CYAN)); wprintw(self->window, " Press the"); wattron(self->window, A_BOLD); - wprintw(self->window, " H "); + wprintw(self->window, " h "); wattroff(self->window, A_BOLD); wprintw(self->window, "key for help\n\n"); wattroff(self->window, COLOR_PAIR(CYAN)); diff --git a/src/help.c b/src/help.c index 87c676a..1490415 100644 --- a/src/help.c +++ b/src/help.c @@ -77,26 +77,26 @@ static void help_draw_menu(ToxWindow *self) wattroff(win, A_BOLD | COLOR_PAIR(RED)); wattron(win, A_BOLD | COLOR_PAIR(BLUE)); - wprintw(win, " G"); + wprintw(win, " g"); wattroff(win, A_BOLD | COLOR_PAIR(BLUE)); wprintw(win, "lobal commands\n"); wattron(win, A_BOLD | COLOR_PAIR(BLUE)); - wprintw(win, " C"); + wprintw(win, " c"); wattroff(win, A_BOLD | COLOR_PAIR(BLUE)); wprintw(win, "hat commands\n"); wattron(win, A_BOLD | COLOR_PAIR(BLUE)); - wprintw(win, " F"); + wprintw(win, " f"); wattroff(win, A_BOLD | COLOR_PAIR(BLUE)); wprintw(win, "riendlist controls\n"); wattron(win, A_BOLD | COLOR_PAIR(BLUE)); - wprintw(win, " K"); + wprintw(win, " k"); wattroff(win, A_BOLD | COLOR_PAIR(BLUE)); wprintw(win, "ey bindings\n"); - wprintw(win, " E"); + wprintw(win, " e"); wattron(win, A_BOLD | COLOR_PAIR(BLUE)); wprintw(win, "x"); wattroff(win, A_BOLD | COLOR_PAIR(BLUE)); @@ -115,11 +115,11 @@ static void help_draw_bottom_menu(WINDOW *win) wmove(win, y2 - 2, 1); wattron(win, A_BOLD | COLOR_PAIR(BLUE)); - wprintw(win, " M"); + wprintw(win, " m"); wattroff(win, A_BOLD | COLOR_PAIR(BLUE)); wprintw(win, "ain menu |"); - wprintw(win, " E"); + wprintw(win, " e"); wattron(win, A_BOLD | COLOR_PAIR(BLUE)); wprintw(win, "x"); wattroff(win, A_BOLD | COLOR_PAIR(BLUE)); From dc9ffa6e56ace8eac909db11381b9a8d0513864f Mon Sep 17 00:00:00 2001 From: Loui Chang Date: Thu, 14 Aug 2014 19:51:52 -0400 Subject: [PATCH 2/3] ipv6enabled parameter was removed in toxcore. Signed-off-by: Loui Chang --- src/global_commands.c | 2 +- src/toxic.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/global_commands.c b/src/global_commands.c index 72ad595..25da12a 100644 --- a/src/global_commands.c +++ b/src/global_commands.c @@ -209,7 +209,7 @@ void cmd_connect(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv) } char *binary_string = hex_string_to_bin(key); - tox_bootstrap_from_address(m, ip, TOX_ENABLE_IPV6_DEFAULT, htons(atoi(port)), (uint8_t *) binary_string); + tox_bootstrap_from_address(m, ip, htons(atoi(port)), (uint8_t *) binary_string); free(binary_string); } diff --git a/src/toxic.c b/src/toxic.c index 08b943a..326c461 100644 --- a/src/toxic.c +++ b/src/toxic.c @@ -286,8 +286,7 @@ static int load_nodelist(const char *filename) int init_connection_helper(Tox *m, int line) { - return tox_bootstrap_from_address(m, toxNodes.nodes[line], TOX_ENABLE_IPV6_DEFAULT, - toxNodes.ports[line], (uint8_t *) toxNodes.keys[line]); + return tox_bootstrap_from_address(m, toxNodes.nodes[line], toxNodes.ports[line], (uint8_t *) toxNodes.keys[line]); } /* Connects to a random DHT node listed in the DHTnodes file From 39556b36f32b99522857bd83bc26c275cdbe8dfe Mon Sep 17 00:00:00 2001 From: Loui Chang Date: Thu, 14 Aug 2014 20:10:14 -0400 Subject: [PATCH 3/3] port is no longer passed in network byte order to tox_bootstrap_from_address() Signed-off-by: Loui Chang --- src/global_commands.c | 2 +- src/toxic.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/global_commands.c b/src/global_commands.c index 25da12a..73f5471 100644 --- a/src/global_commands.c +++ b/src/global_commands.c @@ -209,7 +209,7 @@ void cmd_connect(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv) } char *binary_string = hex_string_to_bin(key); - tox_bootstrap_from_address(m, ip, htons(atoi(port)), (uint8_t *) binary_string); + tox_bootstrap_from_address(m, ip, atoi(port), (uint8_t *) binary_string); free(binary_string); } diff --git a/src/toxic.c b/src/toxic.c index 326c461..5d53adb 100644 --- a/src/toxic.c +++ b/src/toxic.c @@ -266,7 +266,7 @@ static int load_nodelist(const char *filename) snprintf(toxNodes.nodes[toxNodes.lines], sizeof(toxNodes.nodes[toxNodes.lines]), "%s", name); toxNodes.nodes[toxNodes.lines][NODELEN - 1] = 0; - toxNodes.ports[toxNodes.lines] = htons(atoi(port)); + toxNodes.ports[toxNodes.lines] = atoi(port); char *key_binary = hex_string_to_bin(key_ascii); memcpy(toxNodes.keys[toxNodes.lines], key_binary, TOX_CLIENT_ID_SIZE);