1 files changed, 10 insertions, 9 deletions

diff --git a/src/command/cmd_ac.c b/src/command/cmd_ac.c
index f9d5a22a..58ad758a 100644
--- a/src/command/cmd_ac.c
+++ b/src/command/cmd_ac.c
@@ -1,7 +1,7 @@
 /*
  * cmd_ac.c
  *
- * Copyright (C) 2012 - 2018 James Booth <boothj5@gmail.com>
+ * Copyright (C) 2012 - 2019 James Booth <boothj5@gmail.com>
  *
  * This file is part of Profanity.
  *
@@ -582,6 +582,7 @@ cmd_ac_init(void)
     tls_property_ac = autocomplete_new();
     autocomplete_add(tls_property_ac, "force");
     autocomplete_add(tls_property_ac, "allow");
+    autocomplete_add(tls_property_ac, "trust");
     autocomplete_add(tls_property_ac, "legacy");
     autocomplete_add(tls_property_ac, "disable");
 
@@ -664,7 +665,7 @@ cmd_ac_init(void)
     autocomplete_add(time_ac, "console");
     autocomplete_add(time_ac, "chat");
     autocomplete_add(time_ac, "muc");
-    autocomplete_add(time_ac, "mucconfig");
+    autocomplete_add(time_ac, "config");
     autocomplete_add(time_ac, "private");
     autocomplete_add(time_ac, "xml");
     autocomplete_add(time_ac, "statusbar");
@@ -1107,8 +1108,8 @@ cmd_ac_reset(ProfWin *window)
         muc_jid_autocomplete_reset(mucwin->roomjid);
     }
 
-    if (window->type == WIN_MUC_CONFIG) {
-        ProfMucConfWin *confwin = (ProfMucConfWin*)window;
+    if (window->type == WIN_CONFIG) {
+        ProfConfWin *confwin = (ProfConfWin*)window;
         assert(confwin->memcheck == PROFCONFWIN_MEMCHECK);
         if (confwin->form) {
             form_reset_autocompleters(confwin->form);
@@ -2349,13 +2350,13 @@ _inpblock_autocomplete(ProfWin *window, const char *const input, gboolean previo
 static char*
 _form_autocomplete(ProfWin *window, const char *const input, gboolean previous)
 {
-    if (window->type != WIN_MUC_CONFIG) {
+    if (window->type != WIN_CONFIG) {
         return NULL;
     }
 
     char *found = NULL;
 
-    ProfMucConfWin *confwin = (ProfMucConfWin*)window;
+    ProfConfWin *confwin = (ProfConfWin*)window;
     DataForm *form = confwin->form;
     if (form) {
         found = autocomplete_param_with_ac(input, "/form help", form->tag_ac, TRUE, previous);
@@ -2375,13 +2376,13 @@ _form_autocomplete(ProfWin *window, const char *const input, gboolean previous)
 static char*
 _form_field_autocomplete(ProfWin *window, const char *const input, gboolean previous)
 {
-    if (window->type != WIN_MUC_CONFIG) {
+    if (window->type != WIN_CONFIG) {
         return NULL;
     }
 
     char *found = NULL;
 
-    ProfMucConfWin *confwin = (ProfMucConfWin*)window;
+    ProfConfWin *confwin = (ProfConfWin*)window;
     DataForm *form = confwin->form;
     if (form == NULL) {
         return NULL;
@@ -2510,7 +2511,7 @@ _time_autocomplete(ProfWin *window, const char *const input, gboolean previous)
         return found;
     }
 
-    found = autocomplete_param_with_ac(input, "/time mucconfig", time_format_ac, TRUE, previous);
+    found = autocomplete_param_with_ac(input, "/time config", time_format_ac, TRUE, previous);
     if (found) {
         return found;
     }