libtransport.git Changeset - 8d55add7d5eb

Changeset - 8d55add7d5eb

Parent rev.

Child rev.

[Not reviewed]

Merge

6 48 6

Jan Kaluza - 12 years ago 2013-04-11 07:22:09
hanzz.k@gmail.com

Merge pull request #30 from vitalyster/libtwitcurl_fix

Libtwitcurl fix

3 files changed with 12 insertions and 4 deletions:

backends/twitter/libtwitcurl/oauthlib.h

include/Swiften/Network/DummyNetworkFactories.cpp

include/Swiften/Network/DummyNetworkFactories.h

0 comments (0 inline, 0 general)

backends/twitter/libtwitcurl/oauthlib.h

➞

Show inline comments

@@ @@ -38,15 +38,15 @@ namespace oAuthLibDefaults @@
     const std::string OAUTHLIB_AUTHHEADER_STRING = "Authorization: OAuth ";
 };
 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
+{
     eOAuthHttpInvalid = 0,
     eOAuthHttpGet,

include/Swiften/Network/DummyNetworkFactories.cpp

➞

Show inline comments

@@ @@ -12,13 +12,14 @@ @@
 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;
+}
 DummyNetworkFactories::~DummyNetworkFactories() {

include/Swiften/Network/DummyNetworkFactories.h

➞

Show inline comments

@@ @@ -5,12 +5,14 @@ @@
  */
 #pragma once
 #include <Swiften/Network/NetworkFactories.h>
 #include <Swiften/Parser/PlatformXMLParserFactory.h>
 #include <Swiften/IDN/IDNConverter.h>
 #include <Swiften/IDN/PlatformIDNConverter.h>
 namespace Swift {
 	class EventLoop;
 	class DummyNetworkFactories : public NetworkFactories {
 		public:
@@ @@ -22,12 +24,16 @@ namespace Swift { @@
+			}
 			virtual ConnectionFactory* getConnectionFactory() const {
 				return connectionFactory;
+			}
 			IDNConverter* getIDNConverter() const {
 				return idnConverter.get();
+			}
 			DomainNameResolver* getDomainNameResolver() const {
 				return domainNameResolver;
+			}
 			ConnectionServerFactory* getConnectionServerFactory() const {
 				return connectionServerFactory;
@@ @@ -54,11 +60,12 @@ namespace Swift { @@
+            }
 		private:
 			PlatformXMLParserFactory *m_platformXMLParserFactory;
 			TimerFactory* timerFactory;
 			ConnectionFactory* connectionFactory;
 			boost::shared_ptr<IDNConverter> idnConverter;
 			DomainNameResolver* domainNameResolver;
 			ConnectionServerFactory* connectionServerFactory;
 			EventLoop *eventLoop;
 	};
+}

0 comments (0 inline, 0 general)