Remove extraneous local IP checks; let the plugin set the name and don't

try to adjust it based on IP.

src/libtomahawk/network/controlconnection.cpp

@@ -123,16 +123,7 @@ ControlConnection::setup()
         return;
     }
 
-    QString friendlyName;
+    QString friendlyName = name();
-    if ( Servent::isIPWhitelisted( m_sock->peerAddress() ) )
-    {
-        // FIXME TODO blocking DNS lookup if LAN, slow/fails on windows?
-        QHostInfo i = QHostInfo::fromName( m_sock->peerAddress().toString() );
-        if( i.hostName().length() )
-            friendlyName = i.hostName();
-    }
-    else
-        friendlyName = name();
 
     tDebug() << "Detected name:" << name() << friendlyName << m_sock->peerAddress();
 

src/libtomahawk/network/servent.cpp

@@ -695,6 +695,8 @@ Servent::claimOffer( ControlConnection* cc, const QString &nodeid, const QString
 bool
 Servent::checkACL( const Connection* conn, const QString &nodeid, bool showDialog ) const
 {
+    Q_UNUSED( conn );
+    Q_UNUSED( showDialog );
     tDebug( LOGVERBOSE ) << "Checking ACLs";
 
     ACLSystem* aclSystem = ACLSystem::instance();

src/sip/zeroconf/tomahawkzeroconf.h

@@ -55,7 +55,10 @@ signals:
 public slots:
     void resolved( QHostInfo i )
     {
-        emit tomahawkHostFound( ip, port, i.hostName(), nid );
+        if ( i.hostName().length() )
+            emit tomahawkHostFound( ip, port, i.hostName(), nid );
+        else
+            emit tomahawkHostFound( ip, port, "Unknown", nid );
         this->deleteLater();
     }