X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fxmpp%2Fxmpp_messages.c;fp=citadel%2Fmodules%2Fxmpp%2Fxmpp_messages.c;h=b2e2dadf4869736fa5bc15a409f77505842d7917;hp=33a2e1ddbeb548c3ba4335960763eda1bc431a12;hb=bb47b9c23a29dee2a8d801655a237ec50078b348;hpb=57231d9bfac327b0754787f097be79bc83cf24c6 diff --git a/citadel/modules/xmpp/xmpp_messages.c b/citadel/modules/xmpp/xmpp_messages.c index 33a2e1ddb..b2e2dadf4 100644 --- a/citadel/modules/xmpp/xmpp_messages.c +++ b/citadel/modules/xmpp/xmpp_messages.c @@ -75,18 +75,17 @@ void xmpp_output_incoming_messages(void) CCC->FirstExpressMessage = CCC->FirstExpressMessage->next; end_critical_section(S_SESSION_TABLE); - - XPUT("client_jid, strlen(Xmpp->client_jid)); - XPUT("\" from=\""); - XPutProp(ptr->sender_email, strlen(ptr->sender_email)); - XPUT("\" >"); + XPrint(HKEY("message"), 0, + XCPROPERTY("type", "chat"), + XPROPERTY("to", Xmpp->client_jid, strlen(Xmpp->client_jid)), + XPROPERTY("from", ptr->sender_email, strlen(ptr->sender_email)), + TYPE_ARGEND); if (ptr->text != NULL) { striplt(ptr->text); - XPUT(""); - XPutBody(ptr->text, strlen(ptr->text)); - XPUT(""); + XPrint(HKEY("body"), XCLOSED, + XBODY(ptr->text, strlen(ptr->text)), + TYPE_ARGEND); free(ptr->text); } XPUT("");