From 2e76e4f0c7cc574c5d07a9ddb709eee82848a641 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Thu, 5 May 2022 23:50:03 +0200 Subject: [PATCH] ox: remove /ox sendfile because its actually not implemented --- src/command/cmd_ac.c | 8 -------- src/command/cmd_defs.c | 4 +--- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/command/cmd_ac.c b/src/command/cmd_ac.c index 99072d8d..89c2c931 100644 --- a/src/command/cmd_ac.c +++ b/src/command/cmd_ac.c @@ -234,7 +234,6 @@ static Autocomplete pgp_log_ac; static Autocomplete pgp_sendfile_ac; static Autocomplete ox_ac; static Autocomplete ox_log_ac; -static Autocomplete ox_sendfile_ac; #endif static Autocomplete tls_ac; static Autocomplete titlebar_ac; @@ -890,7 +889,6 @@ cmd_ac_init(void) autocomplete_add(ox_ac, "end"); autocomplete_add(ox_ac, "log"); autocomplete_add(ox_ac, "char"); - autocomplete_add(ox_ac, "sendfile"); autocomplete_add(ox_ac, "announce"); autocomplete_add(ox_ac, "discover"); autocomplete_add(ox_ac, "request"); @@ -1613,7 +1611,6 @@ cmd_ac_uninit(void) autocomplete_free(pgp_sendfile_ac); autocomplete_free(ox_ac); autocomplete_free(ox_log_ac); - autocomplete_free(ox_sendfile_ac); #endif autocomplete_free(tls_ac); autocomplete_free(titlebar_ac); @@ -2624,11 +2621,6 @@ _ox_autocomplete(ProfWin* window, const char* const input, gboolean previous) return found; } - found = autocomplete_param_with_ac(input, "/ox sendfile", ox_sendfile_ac, TRUE, previous); - if (found) { - return found; - } - if (strncmp(input, "/ox announce ", 13) == 0) { return cmd_ac_complete_filepath(input, "/ox announce", previous); } diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c index f2cc1513..8c8af70f 100644 --- a/src/command/cmd_defs.c +++ b/src/command/cmd_defs.c @@ -1728,7 +1728,6 @@ static struct cmd_t command_defs[] = { "/ox end", "/ox log on|off|redact", "/ox char ", - "/ox sendfile on|off", "/ox announce ", "/ox discover ", "/ox request ") @@ -1747,8 +1746,7 @@ static struct cmd_t command_defs[] = { { "char ", "Set the character to be displayed next to PGP encrypted messages." }, { "announce ", "Announce a public key by pushing it on the XMPP Server" }, { "discover ", "Discover public keys of a jid. The OpenPGP Key IDs will be displayed" }, - { "request ", "Request public key. See /ox discover to to get available key IDs." }, - { "sendfile on|off", "Allow /sendfile to send unencrypted files while otherwise using PGP." }) + { "request ", "Request public key. See /ox discover to to get available key IDs." }) CMD_EXAMPLES( "/ox log off", "/ox start odin@valhalla.edda",