From 69663b83c8dd5b494e0dc6554507ab53ef0c18b9 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Thu, 28 Apr 2022 17:54:12 +0200 Subject: Fix ox autocompletion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sometimes this happened: `ox d` → `/ox request` `ox a` → `/ox request` `ox c` → `/ox keys` `ox s` → `/ox keys` `ox e` → `/ox keys` We didn't reset the ox_*_ac variables. --- src/command/cmd_ac.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/command/cmd_ac.c b/src/command/cmd_ac.c index 1f6246a4..6c8ddf50 100644 --- a/src/command/cmd_ac.c +++ b/src/command/cmd_ac.c @@ -1436,6 +1436,7 @@ cmd_ac_reset(ProfWin* window) autocomplete_reset(pgp_ac); autocomplete_reset(pgp_log_ac); autocomplete_reset(pgp_sendfile_ac); + autocomplete_reset(ox_ac); #endif autocomplete_reset(tls_ac); autocomplete_reset(titlebar_ac); @@ -1597,6 +1598,9 @@ cmd_ac_uninit(void) autocomplete_free(pgp_ac); autocomplete_free(pgp_log_ac); 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); @@ -2568,6 +2572,11 @@ _ox_autocomplete(ProfWin* window, const char* const input, gboolean previous) { char* found = NULL; + found = autocomplete_param_with_ac(input, "/ox", ox_ac, TRUE, previous); + if (found) { + return found; + } + jabber_conn_status_t conn_status = connection_get_status(); if (conn_status == JABBER_CONNECTED) { @@ -2601,9 +2610,7 @@ _ox_autocomplete(ProfWin* window, const char* const input, gboolean previous) return cmd_ac_complete_filepath(input, "/ox announce", previous); } - found = autocomplete_param_with_ac(input, "/ox", ox_ac, TRUE, previous); - - return found; + return NULL; } #endif -- cgit 1.4.1-2-gfad0