From b2f86045d3b3dc2a454f127f186429b60e493072 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 6 Feb 2015 23:36:02 +0000
Subject: merge from branch

git-svn-id: http://svn.miranda-ng.org/main/trunk@12029 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/WhatsApp/src/WhatsAPI++/WALogin.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'protocols/WhatsApp/src/WhatsAPI++/WALogin.cpp')

diff --git a/protocols/WhatsApp/src/WhatsAPI++/WALogin.cpp b/protocols/WhatsApp/src/WhatsAPI++/WALogin.cpp
index edec990dfa..80be5402ed 100644
--- a/protocols/WhatsApp/src/WhatsAPI++/WALogin.cpp
+++ b/protocols/WhatsApp/src/WhatsAPI++/WALogin.cpp
@@ -8,7 +8,6 @@
 #include "WALogin.h"
 #include "ByteArray.h"
 #include "ProtocolTreeNode.h"
-#include "WAException.h"
 #include <iostream>
 #include <vector>
 #include <map>
@@ -18,7 +17,7 @@
 
 using namespace Utilities;
 
-WALogin::WALogin(WAConnection* connection, const std::string& password)
+WALogin::WALogin(WAConnection* connection, const std::string &password)
 {
 	m_pConnection = connection;
 	m_szPassword = password;
@@ -97,12 +96,9 @@ std::vector<unsigned char>* WALogin::getAuthBlob(const std::vector<unsigned char
 std::vector<unsigned char> WALogin::readFeaturesUntilChallengeOrSuccess()
 {
 	while (ProtocolTreeNode *root = m_pConnection->in.nextTree()) {
-		#ifdef _DEBUG
-			{
-				string tmp = root->toString();
-				m_pConnection->logData(tmp.c_str());
-			}
-		#endif
+		string tmp = root->toString();
+		m_pConnection->logData(tmp.c_str());
+
 		if (ProtocolTreeNode::tagEquals(root, "stream:features")) {
 			m_pConnection->supports_receipt_acks = root->getChild("receipt_acks") != NULL;
 			delete root;
-- 
cgit v1.2.3