X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitadel.h;h=a3ad3c3121e6134b55b5f1280366e99336193309;hb=55013f95f08eafe1b375df4241e8defe387c6cdc;hp=cdc0a6b7ee2e52caeb8739b3756de8536397c7d8;hpb=33a166e5fa4b6e3b013d6093a957fc3ba7edc252;p=citadel.git

diff --git a/citadel/citadel.h b/citadel/citadel.h
index cdc0a6b7e..a3ad3c312 100644
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -1,7 +1,7 @@
 /*
  * Main Citadel header file
  *
- * Copyright (c) 1987-2012 by the citadel.org team
+ * Copyright (c) 1987-2013 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3.
@@ -45,10 +45,10 @@ extern "C" {
  * usually more strict because you're not really supposed to dump/load and
  * upgrade at the same time.
  */
-#define REV_LEVEL	810		/* This version */
+#define REV_LEVEL	820		/* This version */
 #define REV_MIN		591		/* Oldest compatible database */
 #define EXPORT_REV_MIN	760		/* Oldest compatible export files */
-#define LIBCITADEL_MIN	810		/* Minimum required version of libcitadel */
+#define LIBCITADEL_MIN	820		/* Minimum required version of libcitadel */
 
 #define SERVER_TYPE 0			/* zero for stock Citadel; other developers please
 					   obtain SERVER_TYPE codes for your implementations */
@@ -61,12 +61,7 @@ extern "C" {
 
 /* Various length constants */
 
-#define UGLISTLEN	100	/* you get a ungoto list of this size */
 #define ROOMNAMELEN	128	/* The size of a roomname string */
-#define NONCE_SIZE	128	/* Added by <bc> to allow for APOP auth 
-				 * it is BIG becuase there is a hostname
-				 * in the nonce, as per the APOP RFC.
-				 */
 					 
 #define USERNAME_SIZE	64	/* The size of a username string */
 #define MAX_EDITORS	5	/* # of external editors supported */
@@ -202,50 +197,9 @@ struct floor {
 #define NEWREGISTER	0		/* new user to register */
 #define REREGISTER	1		/* existing user reregistering */
 
-#define READ_HEADER	2
-#define READ_MSGBODY	3
-
-/* commands we can send to the stty_ctdl() routine */
-#define SB_NO_INTR	0		/* set to Citadel client mode, i/q disabled */
-#define SB_YES_INTR	1		/* set to Citadel client mode, i/q enabled */
-#define SB_SAVE		2		/* save settings */
-#define SB_RESTORE	3		/* restore settings */
-#define SB_LAST		4		/* redo the last command sent */
-
-#define	NEXT_KEY	15
-#define STOP_KEY	3
-
-/* citadel.rc stuff */
-#define RC_NO		0		/* always no */
-#define RC_YES		1		/* always yes */
-#define RC_DEFAULT	2		/* setting depends on user config */
-
-/* keepalives */
-enum {
-	KA_NO,				/* no keepalives */
-	KA_YES,				/* full keepalives */
-	KA_HALF				/* half keepalives */
-};
-
-/* for <;G>oto and <;S>kip commands */
-#define GF_GOTO		0		/* <;G>oto floor mode */
-#define GF_SKIP		1		/* <;S>kip floor mode */
-#define GF_ZAP		2		/* <;Z>ap floor mode */
-
 /* number of items which may be handled by the CONF command */
 #define NUM_CONFIGS 70
 
-/*
- * MIME types used in Citadel for configuration stuff
- */
-#define SPOOLMIME	"application/x-citadel-delivery-list"
-#define	INTERNETCFG	"application/x-citadel-internet-config"
-#define IGNETCFG	"application/x-citadel-ignet-config"
-#define IGNETMAP	"application/x-citadel-ignet-map"
-#define FILTERLIST	"application/x-citadel-filter-list"
-#define SIEVECONFIG	"application/x-citadel-sieve-config"
-#define XMPPMORTUARY	"application/x-citadel-xmpp-mortuary"
-
 #define TRACE	syslog(LOG_DEBUG, "Checkpoint: %s, %d\n", __FILE__, __LINE__)
 
 #ifndef LONG_MAX