1 files changed, 36 insertions, 30 deletions
diff --git a/Swiften/Client/ClientXMLTracer.cpp b/Swiften/Client/ClientXMLTracer.cpp
index b413f40..e1b9e0c 100644
--- a/Swiften/Client/ClientXMLTracer.cpp
+++ b/Swiften/Client/ClientXMLTracer.cpp
@@ -1,55 +1,61 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2010-2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
 #include <Swiften/Client/ClientXMLTracer.h>
 
 #include <iostream>
+
 #include <boost/bind.hpp>
 
 #include <Swiften/Base/Platform.h>
 
 namespace Swift {
 
-ClientXMLTracer::ClientXMLTracer(CoreClient* client, bool bosh) : bosh(bosh) {
+ClientXMLTracer::ClientXMLTracer(CoreClient* client, bool bosh) : bosh_(bosh) {
 #ifdef SWIFTEN_PLATFORM_WIN32
-	beautifier = new XMLBeautifier(true, false);
+    beautifier_ = std::make_unique<XMLBeautifier>(true, false);
 #else
-	beautifier = new XMLBeautifier(true, true);
+    beautifier_ = std::make_unique<XMLBeautifier>(true, true);
 #endif
-	client->onDataRead.connect(boost::bind(&ClientXMLTracer::printData, this, '<', _1));
-	client->onDataWritten.connect(boost::bind(&ClientXMLTracer::printData, this, '>', _1));
-}
-
-ClientXMLTracer::~ClientXMLTracer() {
-	delete beautifier;
+    onDataReadConnection_ = client->onDataRead.connect(boost::bind(&ClientXMLTracer::printData, this, '<', _1));
+    onDataWrittenConnection_ = client->onDataWritten.connect(boost::bind(&ClientXMLTracer::printData, this, '>', _1));
 }
 
 void ClientXMLTracer::printData(char direction, const SafeByteArray& data) {
-	printLine(direction);
-	if (bosh) {
-		std::string line = byteArrayToString(ByteArray(data.begin(), data.end())); 
+    if (bosh_) {
+        printLine(direction);
+        std::string line = byteArrayToString(ByteArray(data.begin(), data.end()));
 // Disabled because it swallows bits of XML (namespaces, if I recall)
-//		size_t endOfHTTP = line.find("\r\n\r\n");
-//		if (false && endOfHTTP != std::string::npos) {
-//			std::cerr << line.substr(0, endOfHTTP) << std::endl << beautifier->beautify(line.substr(endOfHTTP)) << std::endl;
-//		}
-//		else {
-			std::cerr << line << std::endl;
-//		}
-	}
-	else {
-		std::cerr << beautifier->beautify(byteArrayToString(ByteArray(data.begin(), data.end()))) << std::endl;
-	}
+//        size_t endOfHTTP = line.find("\r\n\r\n");
+//        if (false && endOfHTTP != std::string::npos) {
+//            std::cerr << line.substr(0, endOfHTTP) << std::endl << beautifier->beautify(line.substr(endOfHTTP)) << std::endl;
+//        }
+//        else {
+            std::cerr << line << std::endl;
+//        }
+    }
+    else {
+        const auto& str = beautifier_->beautify(byteArrayToString(ByteArray(data.begin(), data.end())));
+
+        if (beautifier_->wasReset()) {
+            printLine(direction);
+        }
+        std::cerr << str;
+        if (beautifier_->getLevel() <= 1) {
+            std::cerr << std::endl;
+        }
+
+    }
 }
 
 void ClientXMLTracer::printLine(char c) {
-	for (unsigned int i = 0; i < 80; ++i) {
-		std::cerr << c;
-	}
-	std::cerr << std::endl;
+    for (unsigned int i = 0; i < 80; ++i) {
+        std::cerr << c;
+    }
+    std::cerr << std::endl;
 }
 
 }