From 641d28c93266c8670ea30295913b32cbe715bf97 Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Thu, 23 May 2013 07:17:29 +0200
Subject: [PATCH] Fix issue with not all accountIds being carried over to
 loading phase.

---
 src/libtomahawk/accounts/AccountManager.cpp | 7 +++----
 src/libtomahawk/accounts/AccountManager.h   | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/libtomahawk/accounts/AccountManager.cpp b/src/libtomahawk/accounts/AccountManager.cpp
index 8a855fa19..1bc1e49ec 100644
--- a/src/libtomahawk/accounts/AccountManager.cpp
+++ b/src/libtomahawk/accounts/AccountManager.cpp
@@ -285,16 +285,15 @@ AccountManager::loadFromConfig()
     qDebug() << "LOADING ALL CREDENTIALS" << accountIds;
 
     m_creds = new CredentialsManager( this );
-    connect( m_creds, SIGNAL( ready() ),
-             this, SLOT( finishLoadingFromConfig() ) );
+    NewClosure( m_creds, SIGNAL( ready() ),
+                this, SLOT( finishLoadingFromConfig( QStringList ) ), accountIds );
     m_creds->loadCredentials( accountIds );
 }
 
 
 void
-AccountManager::finishLoadingFromConfig()
+AccountManager::finishLoadingFromConfig( const QStringList& accountIds )
 {
-    QStringList accountIds = m_creds->keys();
     qDebug() << "LOADING ALL ACCOUNTS" << accountIds;
 
     foreach ( const QString& accountId, accountIds )
diff --git a/src/libtomahawk/accounts/AccountManager.h b/src/libtomahawk/accounts/AccountManager.h
index 42a87eded..675017625 100644
--- a/src/libtomahawk/accounts/AccountManager.h
+++ b/src/libtomahawk/accounts/AccountManager.h
@@ -112,7 +112,7 @@ private slots:
     void init();
     void onStateChanged( Tomahawk::Accounts::Account::ConnectionState state );
     void onError( int code, const QString& msg );
-    void finishLoadingFromConfig();
+    void finishLoadingFromConfig( const QStringList& accountIds );
 
     void onSettingsChanged();