titlebar: allow displaying MUC name and MUC jid

`/titlebar use name|jid` -> `/titlebar show|hide name|jid`

Fix https://github.com/profanity-im/profanity/issues/1284
This commit is contained in:
Michael Vetter
2020-03-24 22:13:14 +01:00
parent fd090d384d
commit f131680055
9 changed files with 65 additions and 63 deletions

View File

@@ -210,7 +210,6 @@ static Autocomplete pgp_sendfile_ac;
static Autocomplete tls_ac;
static Autocomplete titlebar_ac;
static Autocomplete titlebar_show_ac;
static Autocomplete titlebar_use_ac;
static Autocomplete tls_certpath_ac;
static Autocomplete script_ac;
static Autocomplete script_show_ac;
@@ -825,10 +824,8 @@ cmd_ac_init(void)
autocomplete_add(titlebar_show_ac, "encwarn");
autocomplete_add(titlebar_show_ac, "resource");
autocomplete_add(titlebar_show_ac, "presence");
titlebar_use_ac = autocomplete_new();
autocomplete_add(titlebar_use_ac, "name");
autocomplete_add(titlebar_use_ac, "jid");
autocomplete_add(titlebar_show_ac, "jid");
autocomplete_add(titlebar_show_ac, "name");
tls_certpath_ac = autocomplete_new();
autocomplete_add(tls_certpath_ac, "set");
@@ -1256,7 +1253,6 @@ cmd_ac_reset(ProfWin *window)
autocomplete_reset(tls_ac);
autocomplete_reset(titlebar_ac);
autocomplete_reset(titlebar_show_ac);
autocomplete_reset(titlebar_use_ac);
autocomplete_reset(tls_certpath_ac);
autocomplete_reset(console_ac);
autocomplete_reset(console_msg_ac);
@@ -1405,7 +1401,6 @@ cmd_ac_uninit(void)
autocomplete_free(tls_ac);
autocomplete_free(titlebar_ac);
autocomplete_free(titlebar_show_ac);
autocomplete_free(titlebar_use_ac);
autocomplete_free(tls_certpath_ac);
autocomplete_free(script_ac);
autocomplete_free(script_show_ac);
@@ -3085,11 +3080,6 @@ _titlebar_autocomplete(ProfWin *window, const char *const input, gboolean previo
return result;
}
result = autocomplete_param_with_ac(input, "/titlebar use", titlebar_use_ac, TRUE, previous);
if (result) {
return result;
}
result = autocomplete_param_with_ac(input, "/titlebar", titlebar_ac, TRUE, previous);
if (result) {
return result;