From: Art Cancro <ajc@citadel.org>
Date: Sat, 27 Mar 2010 15:22:18 +0000 (+0000)
Subject: * Disable the XMPP-mortuary code.  It's not ready for production yet.
X-Git-Tag: v7.86~281
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=b5049ae396fe6978debf90a1e1e75ef60ff61f74;hp=49a09df11a7146bf301e8b19c27498a629446e4f;p=citadel.git

* 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 b3cdab14f..0daf9ac02 100644
--- 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 1657661bf..9d6c6acf0 100644
--- 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);