XMPP: continue work on message body

diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c
index 63b27c5138936a650f58d9a4eecae8a45a2d0a1b..ea58e3b627dbf9efd6fe658419ed5dfc14f29ee5 100644 (file)
--- a/citadel/modules/xmpp/serv_xmpp.c
+++ b/citadel/modules/xmpp/serv_xmpp.c
@@ -282,7 +282,7 @@ void xmpp_start_auth(void *data, const char *supplied_el, const char **attr)
                }
        }
 }
-
+/*
 void xmpp_start_message(void *data, const char *supplied_el, const char **attr)
 {
        int i;
@@ -293,7 +293,7 @@ void xmpp_start_message(void *data, const char *supplied_el, const char **attr)
                }
        }
 }
-
+*/
 void xmpp_start_html(void *data, const char *supplied_el, const char **attr)
 {
        ++XMPP->html_tag_level;
@@ -931,7 +931,7 @@ CTDL_MODULE_INIT(xmpp)
                AddXMPPStartHandler(HKEY("query"),      xmpp_start_query, 0);
                AddXMPPStartHandler(HKEY("bind"),       xmpp_start_bind, 0);
                AddXMPPStartHandler(HKEY("auth"),       xmpp_start_auth, 0);
-               AddXMPPStartHandler(HKEY("message"),    xmpp_start_message, 0);
+///            AddXMPPStartHandler(HKEY("message"),    xmpp_start_message, 0);
                AddXMPPStartHandler(HKEY("html"),       xmpp_start_html, 0);
 
 

diff --git a/citadel/modules/xmpp/serv_xmpp.h b/citadel/modules/xmpp/serv_xmpp.h
index ba19e7af26265f92f62c8edb615b3e3ad811fa63..97264ff30a5f6dfd435c76a5c99bc464e72a7212 100644 (file)
--- a/citadel/modules/xmpp/serv_xmpp.h
+++ b/citadel/modules/xmpp/serv_xmpp.h
@@ -31,6 +31,7 @@ typedef struct _citxmpp {                     /* Information about the current session */
        int last_event_processed;
 
        TheToken_iq IQ;
+       TheToken_message Message;
 
        char iq_client_username[256];   /* username requested by the client (NON SASL ONLY) */
        char iq_client_password[256];   /* password requested by the client (NON SASL ONLY) */

diff --git a/citadel/modules/xmpp/xmpp_xmacros.c b/citadel/modules/xmpp/xmpp_xmacros.c
index 3ef9f3161c8db450ef00ac9ef030d56bed7cf524..b7f5e672e695b036416adabe217b0a3077d9baca 100644 (file)
--- a/citadel/modules/xmpp/xmpp_xmacros.c
+++ b/citadel/modules/xmpp/xmpp_xmacros.c
@@ -15,7 +15,7 @@ void *GetToken_piq(void)
 
 void *GetToken_message(void)
 {
-       return NULL;
+       return &XMPP->Message;
 }