From 4e263cb53a081da54fc1f248318a7534787ce5d6 2013-04-11 07:44:10
From: Jan Kaluza <hanzz.k@gmail.com>
Date: 2013-04-11 07:44:10
Subject: [PATCH] Fix compilation with Swiften2

---

diff --git a/include/Swiften/Network/DummyNetworkFactories.cpp b/include/Swiften/Network/DummyNetworkFactories.cpp
index 9da055e3a9e40996a4415902e742ed2740a957b5..28fbe5b0f6b49333295db39b7414bf8467a6f49e 100644
--- a/include/Swiften/Network/DummyNetworkFactories.cpp
+++ b/include/Swiften/Network/DummyNetworkFactories.cpp
@@ -15,8 +15,12 @@ namespace Swift {
 DummyNetworkFactories::DummyNetworkFactories(EventLoop* eventLoop) {
 	timerFactory = new DummyTimerFactory();
 	connectionFactory = new DummyConnectionFactory(eventLoop);
+#if HAVE_SWIFTEN_3
 	idnConverter = boost::shared_ptr<IDNConverter>(PlatformIDNConverter::create());
 	domainNameResolver = new PlatformDomainNameResolver(idnConverter.get(), eventLoop);
+#else
+	domainNameResolver = new PlatformDomainNameResolver(eventLoop);
+#endif
 	connectionServerFactory = new DummyConnectionServerFactory(eventLoop);
 	m_platformXMLParserFactory =  new PlatformXMLParserFactory();
 	this->eventLoop = eventLoop;
diff --git a/include/Swiften/Network/DummyNetworkFactories.h b/include/Swiften/Network/DummyNetworkFactories.h
index 64694e8aeb3ff45f8217ea1b3411072949e35e0b..22537c3fa3de893a19a53b4051ed8ac016b82a81 100644
--- a/include/Swiften/Network/DummyNetworkFactories.h
+++ b/include/Swiften/Network/DummyNetworkFactories.h
@@ -6,10 +6,15 @@
 
 #pragma once
 
+#include <Swiften/Version.h>
+#define HAVE_SWIFTEN_3  SWIFTEN_VERSION >= 0x030000
+
 #include <Swiften/Network/NetworkFactories.h>
 #include <Swiften/Parser/PlatformXMLParserFactory.h>
+#if HAVE_SWIFTEN_3
 #include <Swiften/IDN/IDNConverter.h>
 #include <Swiften/IDN/PlatformIDNConverter.h>
+#endif
 
 namespace Swift {
 	class EventLoop;
@@ -27,9 +32,11 @@ namespace Swift {
 				return connectionFactory;
 			}
 
+#if HAVE_SWIFTEN_3
 			IDNConverter* getIDNConverter() const {
 				return idnConverter.get();
 			}
+#endif
 
 			DomainNameResolver* getDomainNameResolver() const {
 				return domainNameResolver;
@@ -63,7 +70,9 @@ namespace Swift {
 			PlatformXMLParserFactory *m_platformXMLParserFactory;
 			TimerFactory* timerFactory;
 			ConnectionFactory* connectionFactory;
+#if HAVE_SWIFTEN_3
 			boost::shared_ptr<IDNConverter> idnConverter;
+#endif
 			DomainNameResolver* domainNameResolver;
 			ConnectionServerFactory* connectionServerFactory;
 			EventLoop *eventLoop;