From c9c8625581b2afba581e8832830a6662aac45c09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Fri, 20 Feb 2015 22:33:48 +0100 Subject: [PATCH] relay: fix up/down keys on relay buffer (closes #335) --- ChangeLog.asciidoc | 1 + src/plugins/relay/relay-command.c | 38 ++++++++++++++++++------------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc index 869b62d18..dd13762fd 100644 --- a/ChangeLog.asciidoc +++ b/ChangeLog.asciidoc @@ -31,6 +31,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] === Bugs fixed * irc: fix completion of commands /allchan and /allpv +* relay: fix up/down keys on relay buffer (closes #335) * relay: remove v4-mapped addresses in /help relay.network.allowed_ips (closes #325) diff --git a/src/plugins/relay/relay-command.c b/src/plugins/relay/relay-command.c index 279ae3a46..b6c958a06 100644 --- a/src/plugins/relay/relay-command.c +++ b/src/plugins/relay/relay-command.c @@ -311,6 +311,27 @@ relay_command_relay (void *data, struct t_gui_buffer *buffer, int argc, return WEECHAT_RC_OK; } + if (weechat_strcasecmp (argv[1], "up") == 0) + { + if (relay_buffer && (relay_buffer_selected_line > 0)) + { + relay_buffer_selected_line--; + relay_buffer_refresh (NULL); + } + return WEECHAT_RC_OK; + } + + if (weechat_strcasecmp (argv[1], "down") == 0) + { + if (relay_buffer + && relay_buffer_selected_line < relay_client_count - 1) + { + relay_buffer_selected_line++; + relay_buffer_refresh (NULL); + } + return WEECHAT_RC_OK; + } + WEECHAT_COMMAND_ERROR; } @@ -320,24 +341,9 @@ relay_command_relay (void *data, struct t_gui_buffer *buffer, int argc, if (relay_buffer) { weechat_buffer_set (relay_buffer, "display", "1"); - - if (argc > 1) - { - if (strcmp (argv[1], "up") == 0) - { - if (relay_buffer_selected_line > 0) - relay_buffer_selected_line--; - } - else if (strcmp (argv[1], "down") == 0) - { - if (relay_buffer_selected_line < relay_client_count - 1) - relay_buffer_selected_line++; - } - } + relay_buffer_refresh (NULL); } - relay_buffer_refresh (NULL); - return WEECHAT_RC_OK; }