X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitadel.h;h=f3ef0ceb0c0426a59fed397846b0209eb8ffd21e;hb=97a1a0d3086fd9a7e52f05687eb039e6ef7a5c79;hp=266eac3a62aabe0e30c166848f54b6c6350c198f;hpb=04d1ceb0880d7ae15a2b9514728ad5be7e9b569a;p=citadel.git

diff --git a/citadel/citadel.h b/citadel/citadel.h
index 266eac3a6..f3ef0ceb0 100644
--- a/citadel/citadel.h
+++ b/citadel/citadel.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Main Citadel header file
  *
  * Copyright (c) 1987-2010 by the citadel.org team
@@ -53,10 +51,10 @@ extern "C" {
  * usually more strict because you're not really supposed to dump/load and
  * upgrade at the same time.
  */
-#define REV_LEVEL	781		/* This version */
+#define REV_LEVEL	801		/* This version */
 #define REV_MIN		591		/* Oldest compatible database */
 #define EXPORT_REV_MIN	760		/* Oldest compatible export files */
-#define LIBCITADEL_MIN	781		/* Minimum required version of libcitadel */
+#define LIBCITADEL_MIN	801		/* Minimum required version of libcitadel */
 
 #define SERVER_TYPE 0			/* zero for stock Citadel; other developers please
 					   obtain SERVER_TYPE codes for your implementations */
@@ -153,8 +151,6 @@ struct ctdluser {			/* User record                      */
 	time_t lastcall;		/* Date/time of most recent login    */
 	int USuserpurge;		/* Purge time (in days) for user     */
 	char fullname[64];		/* Display name (primary identifier) */
-	cit_uint8_t USscreenwidth;	/* Screen width (for textmode users) */
-	cit_uint8_t USscreenheight;	/* Screen height(for textmode users) */
 };
 
 
@@ -283,7 +279,7 @@ enum {
 #define SIEVECONFIG	"application/x-citadel-sieve-config"
 #define XMPPMORTUARY	"application/x-citadel-xmpp-mortuary"
 
-#define TRACE	CtdlLogPrintf(CTDL_DEBUG, "Checkpoint: %s, %d\n", __FILE__, __LINE__)
+#define TRACE	syslog(LOG_DEBUG, "Checkpoint: %s, %d\n", __FILE__, __LINE__)
 
 #ifndef LONG_MAX
 #define LONG_MAX 2147483647L