aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-01-03 14:57:42 -05:00
Code

ox: group online autocompletion together

Browse Source
This commit is contained in:
Michael Vetter 2022-04-28 17:37:24 +02:00
parent 2dc0cc489c
commit 9fcd589682
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/command/cmd_ac.c
View File

@ -876,7 +876,6 @@ cmd_ac_init(void)
autocomplete_add(pgp_sendfile_ac, "on"); autocomplete_add(pgp_sendfile_ac, "on");
autocomplete_add(pgp_sendfile_ac, "off"); autocomplete_add(pgp_sendfile_ac, "off");
// XEP-0373: OX
ox_ac = autocomplete_new(); ox_ac = autocomplete_new();
autocomplete_add(ox_ac, "keys"); autocomplete_add(ox_ac, "keys");
autocomplete_add(ox_ac, "contacts"); autocomplete_add(ox_ac, "contacts");
@ -2576,10 +2575,13 @@ _ox_autocomplete(ProfWin* window, const char* const input, gboolean previous)
if (found) { if (found) {
return found; return found;
} }
found = autocomplete_param_with_func(input, "/ox discover", roster_contact_autocomplete, previous, NULL);
if (found) {
return found;
} }
if (conn_status == JABBER_CONNECTED) { found = autocomplete_param_with_func(input, "/ox setkey", roster_barejid_autocomplete, previous, NULL);
found = autocomplete_param_with_func(input, "/ox discover", roster_contact_autocomplete, previous, NULL);
if (found) { if (found) {
return found; return found;
} }
@ -2599,13 +2601,6 @@ _ox_autocomplete(ProfWin* window, const char* const input, gboolean previous)
return cmd_ac_complete_filepath(input, "/ox announce", previous); return cmd_ac_complete_filepath(input, "/ox announce", previous);
} }
if (conn_status == JABBER_CONNECTED) {
found = autocomplete_param_with_func(input, "/ox setkey", roster_barejid_autocomplete, previous, NULL);
if (found) {
return found;
}
}
found = autocomplete_param_with_ac(input, "/ox", ox_ac, TRUE, previous); found = autocomplete_param_with_ac(input, "/ox", ox_ac, TRUE, previous);
return found; return found;