X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserv_chat.c;h=b340575c54b372fbc244e3232fa0474a07e31061;hb=0e46236bf34e80bb9b59daab42b65b743cf0b9ba;hp=4511237020f75b95b5157ed7ef92e683504ba86f;hpb=9f26363292ef3785aefcb811652de702ba111125;p=citadel.git

diff --git a/citadel/serv_chat.c b/citadel/serv_chat.c
index 451123702..b340575c5 100644
--- a/citadel/serv_chat.c
+++ b/citadel/serv_chat.c
@@ -44,13 +44,12 @@ extern struct CitContext *ContextList;
 
 char *Dynamic_Module_Init(void)
 {
-	CtdlSendExpressMessageFunc = send_express_message;
-
 	CtdlRegisterProtoHook(cmd_chat, "CHAT", "Begin real-time chat");
 	CtdlRegisterProtoHook(cmd_pexp, "PEXP", "Poll for express messages");
 	CtdlRegisterProtoHook(cmd_gexp, "GEXP", "Get express messages");
 	CtdlRegisterProtoHook(cmd_sexp, "SEXP", "Send an express message");
 	CtdlRegisterSessionHook(delete_express_messages, EVT_STOP);
+	CtdlRegisterXmsgHook(send_express_message);
 	return "$Id$";
 }
 
@@ -550,7 +549,7 @@ void cmd_sexp(char *argbuf)
 	}
 	/* This loop handles text-transfer pages */
 	if (!strcmp(x_msg, "-")) {
-		message_sent = send_express_message(lun, x_user, "");
+		message_sent = PerformXmsgHooks(lun, x_user, "");
 		if (message_sent == 0) {
 			cprintf("%d No user '%s' logged in.\n", ERROR, x_user);
 			return;
@@ -567,12 +566,12 @@ void cmd_sexp(char *argbuf)
 				strcat(x_big_msgbuf, "\n");
 			strcat(x_big_msgbuf, x_msg);
 		}
-		send_express_message(lun, x_user, x_big_msgbuf);
+		PerformXmsgHooks(lun, x_user, x_big_msgbuf);
 		phree(x_big_msgbuf);
 
 		/* This loop handles inline pages */
 	} else {
-		message_sent = send_express_message(lun, x_user, x_msg);
+		message_sent = PerformXmsgHooks(lun, x_user, x_msg);
 
 		if (message_sent > 0) {
 			if (strlen(x_msg) > 0)