Removed the ifdef for the pop3client module

diff --git a/citadel/modules/pop3client/serv_pop3client.c b/citadel/modules/pop3client/serv_pop3client.c
index dbcfff80e9ad6e6149194255f05622059006a150..b90b57f2739c881326eb985e7346e708aba52b30 100644 (file)
--- 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$";
 }