From 47451e4fba708a334f5394127fe6a5533e14f6a4 Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <tomahawk@jefferai.org>
Date: Thu, 31 Mar 2011 15:12:08 -0400
Subject: [PATCH] Add more debugging and remove the don't-try-to-reconnect
 behavior

---
 src/libtomahawk/network/servent.cpp |  3 +++
 src/sip/twitter/twitter.cpp         | 10 +---------
 src/sip/twitter/twitter.h           |  1 -
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/libtomahawk/network/servent.cpp b/src/libtomahawk/network/servent.cpp
index 1d54d0897..083e67d92 100644
--- a/src/libtomahawk/network/servent.cpp
+++ b/src/libtomahawk/network/servent.cpp
@@ -792,8 +792,11 @@ Servent::isIPWhitelisted( QHostAddress ip )
 bool
 Servent::connectedToSession( const QString& session )
 {
+    qDebug() << Q_FUNC_INFO;
+    qDebug() << "Checking against " << session;
     foreach( ControlConnection* cc, m_controlconnections )
     {
+        qDebug() << "Checking session " << cc->id();
         if( cc->id() == session )
             return true;
     }
diff --git a/src/sip/twitter/twitter.cpp b/src/sip/twitter/twitter.cpp
index dd10d5d2c..7947042ae 100644
--- a/src/sip/twitter/twitter.cpp
+++ b/src/sip/twitter/twitter.cpp
@@ -178,7 +178,6 @@ TwitterPlugin::disconnectPlugin()
         delete m_twitterAuth.data();
 
     m_cachedPeers.empty();
-    m_attemptedConnects.empty();
     m_isOnline = false;
 }
 
@@ -571,7 +570,6 @@ TwitterPlugin::registerOffer( const QString &screenName, const QHash< QString, Q
     {
         m_cachedPeers[screenName] = QVariant::fromValue< QHash< QString, QVariant > >( _peerData );
         TomahawkSettings::instance()->setTwitterCachedPeers( m_cachedPeers );
-        m_attemptedConnects[screenName] = false;
     }
 
     if ( m_isOnline && _peerData.contains( "host" ) && _peerData.contains( "port" ) && _peerData.contains( "pkey" ) )
@@ -597,14 +595,9 @@ void
 TwitterPlugin::makeConnection( const QString &screenName, const QHash< QString, QVariant > &peerData )
 {
     qDebug() << Q_FUNC_INFO;
-    if ( m_attemptedConnects.contains( screenName ) && m_attemptedConnects[screenName] )
-    {
-        qDebug() << "Already attempted to connect to " << screenName << " with no change in their status, not trying again for now";
-        return;
-    }
     if ( !peerData.contains( "host" ) || !peerData.contains( "port" ) || !peerData.contains( "pkey" ) || !peerData.contains( "node" ) )
     {
-        qDebug() << "TwitterPlugin could not find host and/or port and/or pkey for peer " << screenName;
+        qDebug() << "TwitterPlugin could not find host and/or port and/or pkey and/or node for peer " << screenName;
         return;
     }
     QString friendlyName = QString( '@' + screenName );
@@ -614,7 +607,6 @@ TwitterPlugin::makeConnection( const QString &screenName, const QHash< QString,
                                             peerData["pkey"].toString(),
                                             friendlyName,
                                             peerData["node"].toString() );
-    m_attemptedConnects[screenName] = true;
 }
 
 void
diff --git a/src/sip/twitter/twitter.h b/src/sip/twitter/twitter.h
index 4e8a98a31..c0da00d7f 100644
--- a/src/sip/twitter/twitter.h
+++ b/src/sip/twitter/twitter.h
@@ -108,7 +108,6 @@ private:
     qint64 m_cachedMentionsSinceId;
     qint64 m_cachedDirectMessagesSinceId;
     QHash< QString, QVariant > m_cachedPeers;
-    QHash< QString, bool > m_attemptedConnects;
     QSet<QString> m_keyCache;
     bool m_finishedFriends;
     bool m_finishedMentions;