X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fsmtp%2Fserv_smtpclient.c;h=c3f33fecdee3f20f0cf325b1eca4f324dd2ccfcd;hb=fdb030b497950239b2b7db63b3953f6a6f425f1e;hp=cafe1ed03ee90b2fd96eb6ea3ff19a51c0a5e63a;hpb=ceec483b7aac5ec74a718a1080de75e10860d298;p=citadel.git

diff --git a/citadel/modules/smtp/serv_smtpclient.c b/citadel/modules/smtp/serv_smtpclient.c
index cafe1ed03..c3f33fecd 100644
--- a/citadel/modules/smtp/serv_smtpclient.c
+++ b/citadel/modules/smtp/serv_smtpclient.c
@@ -87,6 +87,7 @@
 #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 */
 
@@ -988,10 +989,11 @@ void smtp_init_spoolout(void) {
 }
 
 
-
+#endif
 
 CTDL_MODULE_INIT(smtp_client)
 {
+#ifndef EXPERIMENTAL_SMTP_EVENT_CLIENT
 	if (!threading)
 	{
 		smtp_init_spoolout();
@@ -999,6 +1001,8 @@ CTDL_MODULE_INIT(smtp_client)
 		CtdlRegisterProtoHook(cmd_smtp, "SMTP", "SMTP utility commands");
 	}
 	
+#endif
 	/* return our Subversion id for the Log */
-	return "smtp";
+	return "smtpclient";
 }
+