stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'swiften_update'

Browse source
This commit is contained in:
Vitaly Takmazov 2013-04-10 23:10:54 +04:00
commit 6dc7437b53
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/Swiften/Network/DummyNetworkFactories.cpp
View file

@ -15,7 +15,8 @@ namespace Swift {
DummyNetworkFactories::DummyNetworkFactories(EventLoop* eventLoop) {
timerFactory = new DummyTimerFactory();
connectionFactory = new DummyConnectionFactory(eventLoop);
domainNameResolver = new PlatformDomainNameResolver(eventLoop);
idnConverter = boost::shared_ptr<IDNConverter>(PlatformIDNConverter::create());
domainNameResolver = new PlatformDomainNameResolver(idnConverter.get(), eventLoop);
connectionServerFactory = new DummyConnectionServerFactory(eventLoop);
m_platformXMLParserFactory = new PlatformXMLParserFactory();
this->eventLoop = eventLoop;

7
include/Swiften/Network/DummyNetworkFactories.h
View file

@ -8,6 +8,8 @@
#include <Swiften/Network/NetworkFactories.h>
#include <Swiften/Parser/PlatformXMLParserFactory.h>
#include <Swiften/IDN/IDNConverter.h>
#include <Swiften/IDN/PlatformIDNConverter.h>
namespace Swift {
class EventLoop;
@ -25,6 +27,10 @@ namespace Swift {
return connectionFactory;
}
IDNConverter* getIDNConverter() const {
return idnConverter.get();
}
DomainNameResolver* getDomainNameResolver() const {
return domainNameResolver;
}
@ -57,6 +63,7 @@ namespace Swift {
PlatformXMLParserFactory *m_platformXMLParserFactory;
TimerFactory* timerFactory;
ConnectionFactory* connectionFactory;
boost::shared_ptr<IDNConverter> idnConverter;
DomainNameResolver* domainNameResolver;
ConnectionServerFactory* connectionServerFactory;
EventLoop *eventLoop;