From ea5cefd2d4f9f290155c068b2671f9650312ea7b Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Tue, 3 May 2011 19:17:00 -0400
Subject: [PATCH] Auto-create zeroconf plugin with new installs Actually save
 no-config-widget plugins to settings too

---
 src/libtomahawk/tomahawksettings.cpp | 18 +++++++++---------
 src/libtomahawk/tomahawksettings.h   |  1 +
 src/settingsdialog.cpp               |  1 +
 src/sip/zeroconf/zeroconf.cpp        |  2 --
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/libtomahawk/tomahawksettings.cpp b/src/libtomahawk/tomahawksettings.cpp
index 1f9c96fc7..23072ef28 100644
--- a/src/libtomahawk/tomahawksettings.cpp
+++ b/src/libtomahawk/tomahawksettings.cpp
@@ -47,6 +47,7 @@ TomahawkSettings::TomahawkSettings( QObject* parent )
     if( !contains( "configversion") )
     {
         setValue( "configversion", VERSION );
+        doInitialSetup();
     }
     else if( value( "configversion" ).toUInt() != VERSION )
     {
@@ -72,6 +73,14 @@ TomahawkSettings::~TomahawkSettings()
     s_instance = 0;
 }
 
+void
+TomahawkSettings::doInitialSetup()
+{
+    // by default we add a local network resolver
+    addSipPlugin( "sipzeroconf_autocreated" );
+}
+
+
 void
 TomahawkSettings::doUpgrade( int oldVersion, int newVersion )
 {
@@ -104,10 +113,6 @@ TomahawkSettings::doUpgrade( int oldVersion, int newVersion )
             remove( "jabber/autoconnect" );
             remove( "jabber/server" );
             remove( "jabber/port" );
-
-            // will be auto-added in the appropriate places
-//             SipPlugin* p = SipHandler::instance()->loadPlugin( "sipjabber_legacy" );
-//             SipHandler::instance()->enablePlugin( p );
         }
         if( contains( "twitter/ScreenName" ) && contains( "twitter/OAuthToken" ) )
         {
@@ -127,14 +132,9 @@ TomahawkSettings::doUpgrade( int oldVersion, int newVersion )
             remove( "twitter/CachedFriendsSinceID" );
             remove( "twitter/CachedMentionsSinceID" );
             remove( "twitter/CachedDirectMessagesSinceID" );
-
-//             SipPlugin* p = SipHandler::instance()->loadPlugin( "siptwitter_legacy" );
-//             SipHandler::instance()->enablePlugin( p );
         }
         // create a zeroconf plugin too
         addSipPlugin( "sipzeroconf_legacy" );
-//         SipPlugin* p = SipHandler::instance()->createPlugin( "sipzeroconf" );
-//         SipHandler::instance()->enablePlugin( p );
     }
 }
 
diff --git a/src/libtomahawk/tomahawksettings.h b/src/libtomahawk/tomahawksettings.h
index 0c1468596..366355bb4 100644
--- a/src/libtomahawk/tomahawksettings.h
+++ b/src/libtomahawk/tomahawksettings.h
@@ -162,6 +162,7 @@ signals:
     void recentlyPlayedPlaylistAdded( const Tomahawk::playlist_ptr& playlist );
 
 private:
+    void doInitialSetup();
     void doUpgrade( int oldVersion, int newVersion );
 
     static TomahawkSettings* s_instance;
diff --git a/src/settingsdialog.cpp b/src/settingsdialog.cpp
index 7762a5c00..4ebd4741d 100644
--- a/src/settingsdialog.cpp
+++ b/src/settingsdialog.cpp
@@ -542,6 +542,7 @@ SettingsDialog::sipFactoryClicked( SipPluginFactory* factory )
     } else {
         // no config, so just add it
         added = true;
+        TomahawkSettings::instance()->addSipPlugin( p->pluginId() );
         SipHandler::instance()->addSipPlugin( p );
     }
 
diff --git a/src/sip/zeroconf/zeroconf.cpp b/src/sip/zeroconf/zeroconf.cpp
index 3c338588f..d169ba41f 100644
--- a/src/sip/zeroconf/zeroconf.cpp
+++ b/src/sip/zeroconf/zeroconf.cpp
@@ -26,8 +26,6 @@ ZeroconfFactory::createPlugin( const QString& pluginId )
     return new ZeroconfPlugin( pluginId.isEmpty() ? generateId() : pluginId );
 }
 
-
-
 const QString
 ZeroconfPlugin::name() const
 {