diff options
| author | Stefan Kropp <stefan.kropp@posteo.de> | 2022-10-17 17:05:54 +0200 |
|---|---|---|
| committer | Michael Vetter <jubalh@iodoru.org> | 2022-10-17 17:12:29 +0200 |
| commit | 5401c1b634a8d4763a15c5f696f37c5c07548ab4 (patch) | |
| tree | b06026f807e77f1515d5c569a01305d591eb3515 /src | |
| parent | 65aff65596561424c5d85a78114a54c1f98b4529 (diff) | |
| download | profani-tty-5401c1b634a8d4763a15c5f696f37c5c07548ab4.tar.gz | |
Fix autocompletion for lastactivity
`/lastactivity` used autocompletion for /status instead. There was no get/set autocompletion thus user had to write `/lastactivity get` to get the proper results. Original fix by Stefan at https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1021028 Proper commit message and adapted patch by jubalh. Co-authored-by: jubalh@iodoru.org
Diffstat (limited to 'src')
| -rw-r--r-- | src/command/cmd_ac.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/command/cmd_ac.c b/src/command/cmd_ac.c index 1ee0c15c..93a503d1 100644 --- a/src/command/cmd_ac.c +++ b/src/command/cmd_ac.c @@ -275,6 +275,7 @@ static Autocomplete intype_ac; static Autocomplete mood_ac; static Autocomplete mood_type_ac; static Autocomplete adhoc_cmd_ac; +static Autocomplete lastactivity_ac; /*! * \brief Initialization of auto completion for commands. @@ -1176,6 +1177,10 @@ cmd_ac_init(void) adhoc_cmd_ac = autocomplete_new(); autocomplete_add(adhoc_cmd_ac, "list"); autocomplete_add(adhoc_cmd_ac, "exec"); + + lastactivity_ac = autocomplete_new(); + autocomplete_add(lastactivity_ac, "set"); + autocomplete_add(lastactivity_ac, "get"); } void @@ -1497,8 +1502,9 @@ cmd_ac_reset(ProfWin* window) autocomplete_reset(mood_ac); autocomplete_reset(mood_type_ac); autocomplete_reset(adhoc_cmd_ac); - autocomplete_reset(script_ac); + autocomplete_reset(lastactivity_ac); + if (script_show_ac) { autocomplete_free(script_show_ac); script_show_ac = NULL; @@ -1665,6 +1671,7 @@ cmd_ac_uninit(void) autocomplete_free(executable_ac); autocomplete_free(intype_ac); autocomplete_free(adhoc_cmd_ac); + autocomplete_free(lastactivity_ac); } static void @@ -4251,8 +4258,8 @@ _lastactivity_autocomplete(ProfWin* window, const char* const input, gboolean pr { char* result = NULL; - result = autocomplete_param_with_ac(input, "/lastactivity", status_ac, TRUE, previous); - if (!result) { + result = autocomplete_param_with_ac(input, "/lastactivity", lastactivity_ac, TRUE, previous); + if (result) { return result; } @@ -4261,9 +4268,10 @@ _lastactivity_autocomplete(ProfWin* window, const char* const input, gboolean pr if (conn_status == JABBER_CONNECTED) { result = autocomplete_param_with_func(input, "/lastactivity set", prefs_autocomplete_boolean_choice, previous, NULL); - if (!result) { - result = autocomplete_param_with_func(input, "/lastactivity get", roster_barejid_autocomplete, previous, NULL); + if (result) { + return result; } + result = autocomplete_param_with_func(input, "/lastactivity get", roster_barejid_autocomplete, previous, NULL); } return result; |