2 files changed, 3 insertions, 2 deletions
diff --git a/Swiften/Network/HTTPConnectProxiedConnection.cpp b/Swiften/Network/HTTPConnectProxiedConnection.cpp
index edbdd82..9ef63f0 100644
--- a/Swiften/Network/HTTPConnectProxiedConnection.cpp
+++ b/Swiften/Network/HTTPConnectProxiedConnection.cpp
@@ -28,18 +28,19 @@
 
 using namespace Swift;
 
 HTTPConnectProxiedConnection::HTTPConnectProxiedConnection(ConnectionFactory* connectionFactory, HostAddressPort proxy, const SafeString& authID, const SafeString& authPassword) : connectionFactory_(connectionFactory), proxy_(proxy), server_(HostAddressPort(HostAddress("0.0.0.0"), 0)), authID_(authID), authPassword_(authPassword) {
 	connected_ = false;
 }
 
 HTTPConnectProxiedConnection::~HTTPConnectProxiedConnection() {
 	if (connection_) {
+		connection_->onConnectFinished.disconnect(boost::bind(&HTTPConnectProxiedConnection::handleConnectionConnectFinished, shared_from_this(), _1));
 		connection_->onDataRead.disconnect(boost::bind(&HTTPConnectProxiedConnection::handleDataRead, shared_from_this(), _1));
 		connection_->onDisconnected.disconnect(boost::bind(&HTTPConnectProxiedConnection::handleDisconnected, shared_from_this(), _1));
 	}
 
 	if (connected_) {
 		std::cerr << "Warning: Connection was still established." << std::endl;
 	}
 }
 
diff --git a/Swiften/Session/BOSHSessionStream.cpp b/Swiften/Session/BOSHSessionStream.cpp
index 95390f4..73bbfd6 100644
--- a/Swiften/Session/BOSHSessionStream.cpp
+++ b/Swiften/Session/BOSHSessionStream.cpp
@@ -42,21 +42,21 @@ BOSHSessionStream::BOSHSessionStream(
 			payloadParserFactories(payloadParserFactories), 
 			payloadSerializers(payloadSerializers), 
 			tlsContextFactory(tlsContextFactory), 
 			timerFactory(timerFactory),
 			xmlParserFactory(xmlParserFactory),
 			eventLoop(eventLoop),
 			firstHeader(true) {
 
 	boost::mt19937 random;
-	boost::uniform_int<> dist(0, LONG_MAX);
+	boost::uniform_int<long> dist(0, LONG_MAX);
 	random.seed(time(NULL));
-	boost::variate_generator<boost::mt19937&, boost::uniform_int<> > randomRID(random, dist);
+	boost::variate_generator<boost::mt19937&, boost::uniform_int<long> > randomRID(random, dist);
 	long initialRID = randomRID();
 
 	connectionPool = new BOSHConnectionPool(connectionFactory, to, initialRID, boshHTTPConnectProxyURL, boshHTTPConnectProxyAuthID, boshHTTPConnectProxyAuthPassword);
 	connectionPool->onSessionTerminated.connect(boost::bind(&BOSHSessionStream::handlePoolSessionTerminated, this, _1));
 	connectionPool->onSessionStarted.connect(boost::bind(&BOSHSessionStream::handlePoolSessionStarted, this));
 	connectionPool->onXMPPDataRead.connect(boost::bind(&BOSHSessionStream::handlePoolXMPPDataRead, this, _1));
 	connectionPool->onBOSHDataRead.connect(boost::bind(&BOSHSessionStream::handlePoolBOSHDataRead, this, _1));
 	connectionPool->onBOSHDataWritten.connect(boost::bind(&BOSHSessionStream::handlePoolBOSHDataWritten, this, _1));