Revert "Libevent integration"

[citadel.git] / citadel / modules / smtp / serv_smtpclient.c

diff --git a/citadel/modules/smtp/serv_smtpclient.c b/citadel/modules/smtp/serv_smtpclient.c
index c3f33fecdee3f20f0cf325b1eca4f324dd2ccfcd..cafe1ed03ee90b2fd96eb6ea3ff19a51c0a5e63a 100644 (file)
--- a/citadel/modules/smtp/serv_smtpclient.c
+++ b/citadel/modules/smtp/serv_smtpclient.c
@@ -87,7 +87,6 @@
 #include "ctdl_module.h"
 
 #include "smtp_util.h"
-#ifndef EXPERIMENTAL_SMTP_EVENT_CLIENT
 
 int run_queue_now = 0; /* Set to 1 to ignore SMTP send retry times */
 
@@ -989,11 +988,10 @@ void smtp_init_spoolout(void) {
 }
 
 
-#endif
+
 
 CTDL_MODULE_INIT(smtp_client)
 {
-#ifndef EXPERIMENTAL_SMTP_EVENT_CLIENT
        if (!threading)
        {
                smtp_init_spoolout();
@@ -1001,8 +999,6 @@ CTDL_MODULE_INIT(smtp_client)
                CtdlRegisterProtoHook(cmd_smtp, "SMTP", "SMTP utility commands");
        }
        
-#endif
        /* return our Subversion id for the Log */
-       return "smtpclient";
+       return "smtp";
 }
-