X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_messages.c;h=ca8d439b522c8c6c7ceec88bc11351e04caa7b02;hb=7a9b0685e406cc83597171cc39d008c7e5459ca8;hp=90e09e281e0b7258ec78d4d320abd112e2b70093;hpb=cfa09472a585c534fd05c8a35811cff9ef18965f;p=citadel.git

diff --git a/citadel/modules/xmpp/xmpp_messages.c b/citadel/modules/xmpp/xmpp_messages.c
index 90e09e281..ca8d439b5 100644
--- a/citadel/modules/xmpp/xmpp_messages.c
+++ b/citadel/modules/xmpp/xmpp_messages.c
@@ -21,18 +21,7 @@
 #include <pwd.h>
 #include <errno.h>
 #include <sys/types.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-#endif
-
+#include <time.h>
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
@@ -97,14 +86,14 @@ void xmpp_send_message(char *message_to, char *message_body) {
 	for (cptr = ContextList; cptr != NULL; cptr = cptr->next) {
 		if (	(cptr->logged_in)
 			&& (cptr->can_receive_im)
-			&& (!strcasecmp(cptr->cs_inet_email, message_to))
+			&& (!strcasecmp(cptr->cs_principal_id, message_to))
 		) {
 			recp = cptr->user.fullname;
 		}
 	}
 
 	if (recp) {
-		PerformXmsgHooks(CC->user.fullname, CC->cs_inet_email, recp, message_body);
+		PerformXmsgHooks(CC->user.fullname, CC->cs_principal_id, recp, message_body);
 	}
 
 	free(XMPP->message_body);