Summary: | Amarok asks for access to kwallet although it does not need any passwords | ||
---|---|---|---|
Product: | [Applications] amarok | Reporter: | S. Burmeister <sven.burmeister> |
Component: | Services/Last.fm | Assignee: | Amarok Developers <amarok-bugs-dist> |
Status: | RESOLVED FIXED | ||
Severity: | normal | CC: | dima, dmeltzer.devel, kde, lfranchi, unnamedrambler |
Priority: | NOR | ||
Version: | 2.3-GIT | ||
Target Milestone: | 2.3.2 | ||
Platform: | openSUSE | ||
OS: | Linux | ||
Latest Commit: | Version Fixed In: | 2.3.2 |
Description
S. Burmeister
2010-03-09 14:45:19 UTC
You don't use last.fm at all? No, I have not set it up. I checked and username and password are empty although the service as such is enabled by default. . Thank you for your feedback. commit 32101128c377a68f08d3aa5e085d3596b8777508 Author: Casey Link <unnamedrambler@gmail.com> Date: Fri May 28 17:46:30 2010 -0500 The last.fm service will now only open the wallet on startup if the user has enabled features that require authentication. BUG: 230098 diff --git a/src/services/lastfm/LastFmServiceConfig.cpp b/src/services/lastfm/LastFmServiceConfig.cpp index e50444e..c5dec70 100644 --- a/src/services/lastfm/LastFmServiceConfig.cpp +++ b/src/services/lastfm/LastFmServiceConfig.cpp @@ -32,11 +32,18 @@ LastFmServiceConfig::LastFmServiceConfig() { KConfigGroup config = KGlobal::config()->group( configSectionName() ); - // open wallet unless explicitly told not to - if( !( config.readEntry( "ignoreWallet", QString() ) == "yes" ) ) { - m_wallet = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(), 0, KWallet::Wallet::Synchronous ); - } + // we only want to load the wallet if the user has enabled features that require a user/pass + bool scrobble = config.readEntry( "scrobble", false ); + bool fetch_sim = config.readEntry( "fetchSimilar", false ); + + if( scrobble || fetch_sim ) // if either of these are true we need the wallet. + { + // open wallet unless explicitly told not to + if( !( config.readEntry( "ignoreWallet", QString() ) == "yes" ) ) { + m_wallet = KWallet::Wallet::openWallet( KWallet::Wallet::NetworkWallet(), 0, KWallet::Wallet::Synchronous ); + } + } load(); } |