Cleanup from my previous fix

ChangeLog

@@ -1,5 +1,6 @@
 Version 0.1.0:
-    * Initial SOCKS5 proxy support.
+    * SOCKS5 proxy support. Noproxy hosts are also supported but no wildcard
+      support (yet).
     * Fix issue where track resolving spinner never stopped if tracks were
       removed from playlist while resolving.
     * Twitter & Jabber profile pictures are shown.

src/libtomahawk/sip/SipHandler.cpp

@@ -389,7 +389,7 @@ SipHandler::connectPlugin( bool startup, const QString &pluginId )
         if ( sip->pluginId() == pluginId )
         {
             Q_ASSERT( m_enabledPlugins.contains( sip ) ); // make sure the plugin we're connecting is enabled. should always be the case
-            sip->refreshProxy();
+            //each sip should refreshProxy() or take care of that function in some other way during connection
             sip->connectPlugin( startup );
         }
     }

src/sip/jabber/jabber.cpp

@@ -532,8 +532,6 @@ JabberPlugin::checkSettings()
 
         setupClientHelper();
 
-        refreshProxy();
-
         qDebug() << Q_FUNC_INFO << "Updated settings";
         connectPlugin( false );
     }