From c5a8c3d1a98622b5c7e461f731b9aba2f1a1083f Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 10 Apr 2013 00:55:37 +0400
Subject: [PATCH 1/2] fixed compilation with latest swiften

---
 include/Swiften/Network/DummyNetworkFactories.cpp | 3 ++-
 include/Swiften/Network/DummyNetworkFactories.h   | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/include/Swiften/Network/DummyNetworkFactories.cpp b/include/Swiften/Network/DummyNetworkFactories.cpp
index 567d467a..9da055e3 100644
--- a/include/Swiften/Network/DummyNetworkFactories.cpp
+++ b/include/Swiften/Network/DummyNetworkFactories.cpp
@@ -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;
diff --git a/include/Swiften/Network/DummyNetworkFactories.h b/include/Swiften/Network/DummyNetworkFactories.h
index 546cb0cc..64694e8a 100644
--- a/include/Swiften/Network/DummyNetworkFactories.h
+++ b/include/Swiften/Network/DummyNetworkFactories.h
@@ -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;

From 6a9fb68678be74feb159612584707ce42ee0fde6 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov <vitalyster@gmail.com>
Date: Wed, 10 Apr 2013 23:09:59 +0400
Subject: [PATCH 2/2] applied fix from
 http://code.google.com/p/twitcurl/issues/detail?id=48

---
 backends/twitter/libtwitcurl/oauthlib.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backends/twitter/libtwitcurl/oauthlib.h b/backends/twitter/libtwitcurl/oauthlib.h
index 5f702e01..306ffc6b 100644
--- a/backends/twitter/libtwitcurl/oauthlib.h
+++ b/backends/twitter/libtwitcurl/oauthlib.h
@@ -41,9 +41,9 @@ namespace oAuthLibDefaults
 namespace oAuthTwitterApiUrls
 {
     /* Twitter OAuth API URLs */
-    const std::string OAUTHLIB_TWITTER_REQUEST_TOKEN_URL = "twitter.com/oauth/request_token";
-    const std::string OAUTHLIB_TWITTER_AUTHORIZE_URL = "twitter.com/oauth/authorize?oauth_token=";
-    const std::string OAUTHLIB_TWITTER_ACCESS_TOKEN_URL = "twitter.com/oauth/access_token";
+    const std::string OAUTHLIB_TWITTER_REQUEST_TOKEN_URL = "api.twitter.com/oauth/request_token";
+    const std::string OAUTHLIB_TWITTER_AUTHORIZE_URL = "api.twitter.com/oauth/authorize?oauth_token=";
+    const std::string OAUTHLIB_TWITTER_ACCESS_TOKEN_URL = "api.twitter.com/oauth/access_token";
 };
 
 typedef enum _eOAuthHttpRequestType