Instant expunge is now the only mode of operation. The expunge semantics have been...

[citadel.git] / textclient / src / tuiconfig.c

diff --git a/textclient/src/tuiconfig.c b/textclient/src/tuiconfig.c
index 3ec778329a6353b9e499dd97f99416086a558db9..89db7316334b98f3b3337e1ed872aad28415883b 100644 (file)
--- a/textclient/src/tuiconfig.c
+++ b/textclient/src/tuiconfig.c
@@ -39,16 +39,16 @@
 #include <stdarg.h>
 #include <libcitadel.h>
 #include "sysdep.h"
-#include "citadel.h"
+///#include "citadel.h"
 #include "citadel_ipc.h"
 #include "citadel_decls.h"
 #include "tuiconfig.h"
 #include "messages.h"
 #include "routines.h"
 #include "commands.h"
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
+///#ifndef HAVE_SNPRINTF
+///#include "snprintf.h"
+///#endif
 #include "screen.h"
 
 /* work around solaris include files */
@@ -129,7 +129,7 @@ void do_system_configuration(CtdlIPC *ipc)
                "Allow anonymous guest logins",
                atoi(&sc[67][0]))));
        snprintf(sc[4], sizeof sc[4], "%d", (boolprompt(
-               "Automatically give room aide privs to a user who creates a private room",
+               "Automatically give room admin privs to a user who creates a private room",
                atoi(&sc[4][0]))));
 
        snprintf(sc[8], sizeof sc[8], "%d", (boolprompt(
@@ -141,7 +141,7 @@ void do_system_configuration(CtdlIPC *ipc)
                "Restrict Internet mail to only those with that privilege",
                atoi(&sc[11][0]))));
        snprintf(sc[26], sizeof sc[26], "%d", (boolprompt(
-               "Allow Aides to Zap (forget) rooms",
+               "Allow admins to Zap (forget) rooms",
                atoi(&sc[26][0]))));
 
        if (!IsEmptyStr(&sc[18][0])) {
@@ -221,9 +221,6 @@ void do_system_configuration(CtdlIPC *ipc)
        snprintf(sc[57], sizeof sc[57], "%d", (boolprompt(
                "Perform RBL checks at greeting instead of after RCPT",
                atoi(&sc[57][0]))));
-       snprintf(sc[44], sizeof sc[44], "%d", (boolprompt(
-               "Instantly expunge deleted IMAP messages",
-               atoi(&sc[44][0]))));
 
        /* LDAP settings */
        if (ipc->ServInfo.supports_ldap) {