libtransport.git Changeset - f81a8aa784da

Changeset - f81a8aa784da

Parent rev.

Child rev.

[Not reviewed]

0 4 0

HanzZ - 14 years ago 2011-10-10 21:09:47
hanzz.k@gmail.com

Fixed compilation issue with latest swiften

4 files changed with 10 insertions and 4 deletions:

include/Swiften/Server/Server.cpp

include/Swiften/Server/Server.h

include/Swiften/Server/ServerFromClientSession.cpp

include/Swiften/Server/ServerFromClientSession.h

0 comments (0 inline, 0 general)

include/Swiften/Server/Server.cpp

➞

Show inline comments

@@ @@ -49,12 +49,14 @@ Server::Server( @@
 	stanzaChannel_ = new ServerStanzaChannel();
 	iqRouter_ = new IQRouter(stanzaChannel_);
 	tlsFactory = NULL;
 	parserFactory_ = new PlatformXMLParserFactory();
+}
 Server::~Server() {
 	stop();
 	delete iqRouter_;
 	delete stanzaChannel_;
 	delete parserFactory_;
+}
 void Server::start() {
 	boost::shared_ptr<ServerFromClientSession> serverFromClientSession = boost::shared_ptr<ServerFromClientSession>(
 			new ServerFromClientSession(idGenerator.generateID(), connection,
 					getPayloadParserFactories(), getPayloadSerializers(), userRegistry_));
+					getPayloadParserFactories(), getPayloadSerializers(), userRegistry_, parserFactory_));
 	//serverFromClientSession->setAllowSASLEXTERNAL();
 	serverFromClientSession->onSessionStarted.connect(

include/Swiften/Server/Server.h

➞

Show inline comments

@@ @@ -22,6 +22,7 @@ @@
 #include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
 #include "Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h"
 #include "Swiften/TLS/PKCS12Certificate.h"
 #include <Swiften/Parser/PlatformXMLParserFactory.h>
 namespace Swift {
 	class ConnectionServer;
@@ @@ -84,5 +85,6 @@ namespace Swift { @@
 			IQRouter *iqRouter_;
 			TLSServerContextFactory *tlsFactory;
 			PKCS12Certificate cert;
 			PlatformXMLParserFactory *parserFactory_;
 	};
+}

include/Swiften/Server/ServerFromClientSession.cpp

➞

Show inline comments

@@ @@ -33,8 +33,9 @@ ServerFromClientSession::ServerFromClientSession( @@
 		boost::shared_ptr<Connection> connection,
 		PayloadParserFactoryCollection* payloadParserFactories,
 		PayloadSerializerCollection* payloadSerializers,
 		UserRegistry* userRegistry) :
 			Session(connection, payloadParserFactories, payloadSerializers),
 		UserRegistry* userRegistry,
 		XMLParserFactory* factory) :
 			Session(connection, payloadParserFactories, payloadSerializers, factory),
 			id_(id),
 			userRegistry_(userRegistry),
 			authenticated_(false),

include/Swiften/Server/ServerFromClientSession.h

➞

Show inline comments

@@ @@ -38,7 +38,8 @@ namespace Swift { @@
 					boost::shared_ptr<Connection> connection,
 					PayloadParserFactoryCollection* payloadParserFactories,
 					PayloadSerializerCollection* payloadSerializers,
 					UserRegistry* userRegistry);
 					UserRegistry* userRegistry,
 					XMLParserFactory* factory);
 			~ServerFromClientSession();
 			boost::signal<void ()> onSessionStarted;

0 comments (0 inline, 0 general)