* Applied matt's funambol patch

[citadel.git] / citadel / sysconfig.h

diff --git a/citadel/sysconfig.h b/citadel/sysconfig.h
index 895dc41c97ea21a9e2cec152ad9f320d491b8a4b..e32627c8d80f3064617fe25d7f58677fbef744a6 100644 (file)
--- a/citadel/sysconfig.h
+++ b/citadel/sysconfig.h
@@ -107,13 +107,12 @@
 #define USERCALENDARROOM       "Calendar"
 #define USERTASKSROOM          "Tasks"
 #define USERCONTACTSROOM       "Contacts"
-#define USERCOLLECTEDROOM      "Collected Addresses"
 #define USERNOTESROOM          "Notes"
+#define USERTRASHROOM          "Trash"
 #define PAGELOGROOM            "Sent/Received Pages"
 #define SYSCONFIGROOM          "Local System Configuration"
 #define SMTP_SPOOLOUT_ROOM     "__CitadelSMTPspoolout__"
-#define DELETED_MSGS_ROOM      "__CitadelDeletedMessages__"
-
+#define FNBL_QUEUE_ROOM                "__CitadelFNBLqueue__"
 /*
  * Where we keep messages containing the vCards that source our directory.  It
  * makes no sense to change this, because you'd have to change it on every
@@ -130,9 +129,17 @@
 /*
  * Pathnames for cryptographic goodness
  */
+/*
 #define        CTDL_CRYPTO_DIR         "./keys"
 #define CTDL_KEY_PATH          CTDL_CRYPTO_DIR "/citadel.key"
 #define CTDL_CSR_PATH          CTDL_CRYPTO_DIR "/citadel.csr"
 #define CTDL_CER_PATH          CTDL_CRYPTO_DIR "/citadel.cer"
-
+*/
 #define THREADSTACKSIZE                1048576
+
+/*
+ * How many messages may the full text indexer scan before flushing its
+ * tables to disk?
+ */
+#define FT_MAX_CACHE           2500
+#