From 315b41d1e94e72730b536e2ee65aaa8d05afa7d4 Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Thu, 23 May 2013 07:16:20 +0200
Subject: [PATCH] *** Restore v14 config file before running to avoid losing
accounts *** Change QtKeychain's user-visible service name to "Tomahawk".
---
src/libtomahawk/TomahawkSettings.cpp | 2 +-
src/libtomahawk/accounts/CredentialsManager.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/libtomahawk/TomahawkSettings.cpp b/src/libtomahawk/TomahawkSettings.cpp
index 51eff109e..546a395bf 100644
--- a/src/libtomahawk/TomahawkSettings.cpp
+++ b/src/libtomahawk/TomahawkSettings.cpp
@@ -627,7 +627,7 @@ TomahawkSettings::doUpgrade( int oldVersion, int newVersion )
tDebug() << "creds:" << creds;
if ( !creds.isEmpty() )
{
- QKeychain::WritePasswordJob* j = new QKeychain::WritePasswordJob( QLatin1String( "tomahawkaccounts" ), this );
+ QKeychain::WritePasswordJob* j = new QKeychain::WritePasswordJob( QLatin1String( "Tomahawk" ), this );
j->setKey( account );
j->setAutoDelete( true );
diff --git a/src/libtomahawk/accounts/CredentialsManager.cpp b/src/libtomahawk/accounts/CredentialsManager.cpp
index 8f6dc9b4d..4fd22aaa5 100644
--- a/src/libtomahawk/accounts/CredentialsManager.cpp
+++ b/src/libtomahawk/accounts/CredentialsManager.cpp
@@ -24,7 +24,7 @@
#include <QStringList>
-#define TOMAHAWK_KEYCHAINSVC QLatin1String("tomahawkaccounts")
+#define TOMAHAWK_KEYCHAINSVC QLatin1String("Tomahawk")
namespace Tomahawk
{