Revert xmpp back to a working state

[citadel.git] / citadel / modules / xmpp / xmpp_presence.c

diff --git a/citadel/modules/xmpp/xmpp_presence.c b/citadel/modules/xmpp/xmpp_presence.c
index f42d74f40b608cd99806790747325bac90ac9453..ca8a95949d8d95b10dc7e8d679787ab072a600ac 100644 (file)
--- a/citadel/modules/xmpp/xmpp_presence.c
+++ b/citadel/modules/xmpp/xmpp_presence.c
@@ -194,13 +194,13 @@ void xmpp_presence_notify(char *presence_jid, int event_type) {
                }
        }
 
-       syslog(LOG_DEBUG, "%d sessions for <%s> are now visible to session %d\n",
-               visible_sessions, presence_jid, CC->cs_pid);
+       XMPP_syslog(LOG_DEBUG, "%d sessions for <%s> are now visible to session %d\n",
+                   visible_sessions, presence_jid, CC->cs_pid);
 
        if ( (event_type == XMPP_EVT_LOGIN) && (visible_sessions == 1) ) {
 
-               syslog(LOG_DEBUG, "Telling session %d that <%s> logged in\n",
-                       CC->cs_pid, presence_jid);
+               XMPP_syslog(LOG_DEBUG, "Telling session %d that <%s> logged in\n",
+                           CC->cs_pid, presence_jid);
 
                /* Do an unsolicited roster update that adds a new contact. */
                assert(which_cptr_is_relevant >= 0);
@@ -214,8 +214,8 @@ void xmpp_presence_notify(char *presence_jid, int event_type) {
        }
 
        if (visible_sessions == 0) {
-               syslog(LOG_DEBUG, "Telling session %d that <%s> logged out\n",
-                       CC->cs_pid, presence_jid);
+               XMPP_syslog(LOG_DEBUG, "Telling session %d that <%s> logged out\n",
+                           CC->cs_pid, presence_jid);
                xmpp_destroy_buddy(presence_jid, 0);    /* non aggressive presence update */
        }
 
@@ -238,12 +238,12 @@ void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) {
        /* now add anyone we find into the hashlist */
 
        /* skip past the headers */
-       ptr = strstr(msg->cm_fields['M'], "\n\n");
+       ptr = strstr(msg->cm_fields[eMesageText], "\n\n");
        if (ptr != NULL) {
                ptr += 2;
        }
        else {
-               ptr = strstr(msg->cm_fields['M'], "\n\r\n");
+               ptr = strstr(msg->cm_fields[eMesageText], "\n\r\n");
                if (ptr != NULL) {
                        ptr += 3;
                }
@@ -259,7 +259,7 @@ void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) {
                }
        }
 
-       CtdlFreeMessage(msg);
+       CM_Free(msg);
 }
 
 
@@ -271,7 +271,7 @@ void xmpp_fetch_mortuary_backend(long msgnum, void *userdata) {
 HashList *xmpp_fetch_mortuary(void) {
        HashList *mortuary = NewHash(1, NULL);
        if (!mortuary) {
-               syslog(LOG_ALERT, "NewHash() failed!\n");
+               XMPPM_syslog(LOG_ALERT, "NewHash() failed!\n");
                return(NULL);
        }