summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Swift/Controllers/FileTransfer/FileTransferController.h1
-rw-r--r--Swiften/Client/ClientSession.cpp4
-rw-r--r--Swiften/Client/ClientSession.h2
3 files changed, 4 insertions, 3 deletions
diff --git a/Swift/Controllers/FileTransfer/FileTransferController.h b/Swift/Controllers/FileTransfer/FileTransferController.h
index 5d98468..3d6f7d5 100644
--- a/Swift/Controllers/FileTransfer/FileTransferController.h
+++ b/Swift/Controllers/FileTransfer/FileTransferController.h
@@ -9,6 +9,7 @@
#include <string>
#include <boost/shared_ptr.hpp>
+#include <boost/cstdint.hpp>
#include <Swiften/JID/JID.h>
#include <Swiften/FileTransfer/FileTransfer.h>
diff --git a/Swiften/Client/ClientSession.cpp b/Swiften/Client/ClientSession.cpp
index 275f913..791ee75 100644
--- a/Swiften/Client/ClientSession.cpp
+++ b/Swiften/Client/ClientSession.cpp
@@ -52,13 +52,13 @@ ClientSession::ClientSession(
allowPLAINOverNonTLS(false),
useStreamCompression(true),
useTLS(UseTLSWhenAvailable),
+ useAcks(true),
needSessionStart(false),
needResourceBind(false),
needAcking(false),
rosterVersioningSupported(false),
authenticator(NULL),
- certificateTrustChecker(NULL),
- useAcks(true) {
+ certificateTrustChecker(NULL) {
}
ClientSession::~ClientSession() {
diff --git a/Swiften/Client/ClientSession.h b/Swiften/Client/ClientSession.h
index 939e96e..2205c8d 100644
--- a/Swiften/Client/ClientSession.h
+++ b/Swiften/Client/ClientSession.h
@@ -159,11 +159,11 @@ namespace Swift {
bool allowPLAINOverNonTLS;
bool useStreamCompression;
UseTLS useTLS;
+ bool useAcks;
bool needSessionStart;
bool needResourceBind;
bool needAcking;
bool rosterVersioningSupported;
- bool useAcks;
ClientAuthenticator* authenticator;
boost::shared_ptr<StanzaAckRequester> stanzaAckRequester_;
boost::shared_ptr<StanzaAckResponder> stanzaAckResponder_;