From: Art Cancro <ajc@citadel.org>
Date: Thu, 20 Sep 2007 20:03:31 +0000 (+0000)
Subject: Removed the ifdef for the pop3client module
X-Git-Tag: v7.86~3058
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=6103f1b94f338a378ff17d5cf4a57c742bf5b844;p=citadel.git

Removed the ifdef for the pop3client module
---

diff --git a/citadel/modules/pop3client/serv_pop3client.c b/citadel/modules/pop3client/serv_pop3client.c
index dbcfff80e..b90b57f27 100644
--- a/citadel/modules/pop3client/serv_pop3client.c
+++ b/citadel/modules/pop3client/serv_pop3client.c
@@ -1,9 +1,7 @@
 /*
- * $Id: $
+ * $Id$
  *
- * Aggregate remote POP3 accounts
- *
- * NOTE: this is disabled in Citadel 7.20 -- enable with -DPOP3_AGGREGATION at your own risk.
+ * Consolidate mail from remote POP3 accounts.
  *
  */
 
@@ -47,9 +45,6 @@ struct pop3aggr {
 
 struct pop3aggr *palist = NULL;
 
-#ifdef POP3_AGGREGATION
-
-
 void pop3_do_fetching(char *roomname, char *pop3host, char *pop3user, char *pop3pass)
 {
 	int sock;
@@ -241,14 +236,11 @@ void pop3client_scan(void) {
 	doing_pop3client = 0;
 }
 
-#endif
 
 CTDL_MODULE_INIT(pop3client)
 {
-#ifdef POP3_AGGREGATION
 	CtdlRegisterSessionHook(pop3client_scan, EVT_TIMER);
-#endif
 
 	/* return our Subversion id for the Log */
-        return "$Id:  $";
+        return "$Id$";
 }