From 2d66daec41acbda856f36270fdb729b37df2c988 Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Thu, 22 Dec 2011 12:34:09 -0500
Subject: [PATCH] initial twitter fix

---
 src/accounts/CMakeLists.txt             | 2 +-
 src/accounts/twitter/sip/twittersip.cpp | 4 ++--
 src/accounts/twitter/sip/twittersip.h   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/accounts/CMakeLists.txt b/src/accounts/CMakeLists.txt
index 8b61be457..c7d709337 100644
--- a/src/accounts/CMakeLists.txt
+++ b/src/accounts/CMakeLists.txt
@@ -4,7 +4,7 @@ IF( LIBJREEN_FOUND )
 ENDIF()
 
 IF( QTWEETLIB_FOUND AND BUILD_GUI )
-#ADD_SUBDIRECTORY( twitter )
+    ADD_SUBDIRECTORY( twitter )
 ENDIF()
 
 ADD_SUBDIRECTORY( zeroconf )
\ No newline at end of file
diff --git a/src/accounts/twitter/sip/twittersip.cpp b/src/accounts/twitter/sip/twittersip.cpp
index 75027ab35..75472c8a0 100644
--- a/src/accounts/twitter/sip/twittersip.cpp
+++ b/src/accounts/twitter/sip/twittersip.cpp
@@ -53,7 +53,7 @@ TwitterSipPlugin::TwitterSipPlugin( Tomahawk::Accounts::Account* account )
     , m_cachedDirectMessagesSinceId( 0 )
     , m_cachedPeers()
     , m_keyCache()
-    , m_state( Disconnected )
+    , m_state( Tomahawk::Accounts::Account::Disconnected )
 {
     qDebug() << Q_FUNC_INFO;
 
@@ -149,7 +149,7 @@ TwitterSipPlugin::disconnectPlugin()
     m_configuration[ "cachedpeers" ] = m_cachedPeers;
     syncConfig();
     m_cachedPeers.empty();
-    m_state = Disconnected;
+    m_state = Tomahawk::Accounts::Account::Disconnected;
     emit stateChanged( m_state );
 }
 
diff --git a/src/accounts/twitter/sip/twittersip.h b/src/accounts/twitter/sip/twittersip.h
index 84963fe17..f8a5428cd 100644
--- a/src/accounts/twitter/sip/twittersip.h
+++ b/src/accounts/twitter/sip/twittersip.h
@@ -48,7 +48,7 @@ public:
     virtual ~TwitterSipPlugin() {}
 
     virtual bool isValid() const;
-    virtual ConnectionState connectionState() const;
+    virtual Tomahawk::Accounts::Account::ConnectionState connectionState() const;
 
 public slots:
     virtual void connectPlugin();
@@ -118,7 +118,7 @@ private:
     QVariantHash m_cachedPeers;
     QHash< QString, QPixmap > m_cachedAvatars;
     QSet<QString> m_keyCache;
-    ConnectionState m_state;
+    Tomahawk::Accounts::Account::ConnectionState m_state;
 };
 
 #endif