* Disable the XMPP-mortuary code. It's not ready for production yet.

diff --git a/citadel/modules/xmpp/serv_xmpp.c b/citadel/modules/xmpp/serv_xmpp.c
index b3cdab14ff87455203f189d6e7fb83af7c8e069e..0daf9ac022886dd857636e87f26aa1d0bf5e6158 100644 (file)
--- a/citadel/modules/xmpp/serv_xmpp.c
+++ b/citadel/modules/xmpp/serv_xmpp.c
@@ -392,7 +392,7 @@ void xmpp_xml_end(void *data, const char *supplied_el) {
 
        else if (!strcasecmp(el, "stream")) {
                CtdlLogPrintf(CTDL_DEBUG, "XMPP client shut down their stream\n");
-               xmpp_massacre_roster();
+               /* xmpp_massacre_roster(); FIXME put this back in when it's finished */
                cprintf("</stream>\n");
                CC->kill_me = 1;
        }

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 1657661bf4e642d80d2ed6f976129326a8b0b63c..9d6c6acf057e3f1ed47b6cdae87ab0f4c7ff3f2b 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1591,6 +1591,8 @@ char *qp_encode_email_addrs(char *source)
 
        if (source == NULL) return source;
        if (IsEmptyStr(source)) return source;
+       cit_backtrace();
+       CtdlLogPrintf(CTDL_DEBUG, "qp_encode_email_addrs: [%s]\n", source);
 
        AddrPtr = malloc (sizeof (long) * nAddrPtrMax);
        AddrUtf8 = malloc (sizeof (long) * nAddrPtrMax);