mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00
Code Issues Releases Wiki Activity

only migrate valid twitter accounts

Browse Source
This commit is contained in:
Leo Franchi
2012-02-12 11:57:06 -05:00
parent 79fd0278ce
commit 0a3dc28bdf
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libtomahawk/tomahawksettings.cpp
View File

@@ -209,15 +209,7 @@ TomahawkSettings::doUpgrade( int oldVersion, int newVersion )
rawpluginname.replace( "jabber", "xmpp" ); rawpluginname.replace( "jabber", "xmpp" );
QString accountKey = QString( "%1account_%2" ).arg( rawpluginname ).arg( pluginId ); QString accountKey = QString( "%1account_%2" ).arg( rawpluginname ).arg( pluginId );
accounts << accountKey;
beginGroup( "accounts/" + accountKey );
setValue( "enabled", enabledSip.contains( sipPlugin ) == true );
setValue( "autoconnect", true );
setValue( "configuration", QVariantHash() );
setValue( "acl", QVariantMap() );
setValue( "types", QStringList() << "SipType" );
endGroup();
if ( pluginName == "sipjabber" || pluginName == "sipgoogle" ) if ( pluginName == "sipjabber" || pluginName == "sipgoogle" )
{ {
QVariantHash credentials; QVariantHash credentials;
@@ -232,6 +224,12 @@ TomahawkSettings::doUpgrade( int oldVersion, int newVersion )
} }
else if ( pluginName == "siptwitter" ) else if ( pluginName == "siptwitter" )
{ {
// Only port twitter plugin if there's a valid twitter config
if ( value( sipPlugin + "/oauthtokensecret" ).toString().isEmpty() &&
value( sipPlugin + "/oauthtoken" ).toString().isEmpty() &&
value( sipPlugin + "/screenname" ).toString().isEmpty() )
continue;
QVariantHash credentials; QVariantHash credentials;
credentials[ "cachedfriendssinceid" ] = value( sipPlugin + "/cachedfriendssinceid" ); credentials[ "cachedfriendssinceid" ] = value( sipPlugin + "/cachedfriendssinceid" );
credentials[ "cacheddirectmessagessinceid" ] = value( sipPlugin + "/cacheddirectmessagessinceid" ); credentials[ "cacheddirectmessagessinceid" ] = value( sipPlugin + "/cacheddirectmessagessinceid" );
@@ -250,6 +248,14 @@ TomahawkSettings::doUpgrade( int oldVersion, int newVersion )
setValue( QString( "accounts/%1/accountfriendlyname" ).arg( accountKey ), "Local Network" ); setValue( QString( "accounts/%1/accountfriendlyname" ).arg( accountKey ), "Local Network" );
} }
beginGroup( "accounts/" + accountKey );
setValue( "enabled", enabledSip.contains( sipPlugin ) == true );
setValue( "autoconnect", true );
setValue( "configuration", QVariantHash() );
setValue( "acl", QVariantMap() );
setValue( "types", QStringList() << "SipType" );
endGroup();
accounts << accountKey;
remove( sipPlugin ); remove( sipPlugin );
} }