From 81575c68e8223ab9844858ae7c3191f1be9f5389 Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Sun, 13 May 2012 20:48:55 -0400
Subject: [PATCH] hook up

---
 src/libtomahawk/AtticaManager.cpp       | 6 +++++-
 src/libtomahawk/utils/TomahawkUtils.cpp | 2 +-
 src/libtomahawk/utils/TomahawkUtils.h   | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/libtomahawk/AtticaManager.cpp b/src/libtomahawk/AtticaManager.cpp
index 72fe40e88..ffed903a6 100644
--- a/src/libtomahawk/AtticaManager.cpp
+++ b/src/libtomahawk/AtticaManager.cpp
@@ -66,6 +66,8 @@ public slots:
         TomahawkSettingsGui::instanceGui()->setAtticaResolverStates( m_manager.data()->m_resolverStates );
         emit m_manager.data()->resolverInstalled( m_resolverId );
         emit m_manager.data()->resolverStateChanged( m_resolverId );
+
+        deleteLater();
     }
     void extractFailed()
     {
@@ -73,6 +75,8 @@ public slots:
             return;
 
         m_manager.data()->resolverInstallationFailed( m_resolverId );
+
+        deleteLater();
     }
 
 private:
@@ -574,7 +578,7 @@ AtticaManager::payloadFetched()
                 return;
             }
 
-            TomahawkUtils::extractBinaryResolver( f.fileName(), resolverId, 0 );
+            TomahawkUtils::extractBinaryResolver( f.fileName(), new BinaryInstallerHelper( resolverId, this ) );
         }
         else
         {
diff --git a/src/libtomahawk/utils/TomahawkUtils.cpp b/src/libtomahawk/utils/TomahawkUtils.cpp
index 9d5049ada..c5533d599 100644
--- a/src/libtomahawk/utils/TomahawkUtils.cpp
+++ b/src/libtomahawk/utils/TomahawkUtils.cpp
@@ -845,7 +845,7 @@ unzipFileInFolder( const QString &zipFileName, const QDir &folder )
 
 
 void
-extractBinaryResolver( const QString& zipFilename, const QString& resolverId, QObject* )
+extractBinaryResolver( const QString& zipFilename, QObject* )
 {
 #if !defined(Q_OS_MAC) && !defined (Q_OS_WIN)
     Q_ASSERT( false );
diff --git a/src/libtomahawk/utils/TomahawkUtils.h b/src/libtomahawk/utils/TomahawkUtils.h
index 7a4d5c1af..27350e3e1 100644
--- a/src/libtomahawk/utils/TomahawkUtils.h
+++ b/src/libtomahawk/utils/TomahawkUtils.h
@@ -115,7 +115,7 @@ namespace TomahawkUtils
         QStringList m_noProxyHosts;
         QNetworkProxy m_proxy;
     };
-    
+
 
     DLLEXPORT QString appFriendlyVersion();
 
@@ -138,7 +138,7 @@ namespace TomahawkUtils
 
     DLLEXPORT QString md5( const QByteArray& data );
     DLLEXPORT bool removeDirectory( const QString& dir );
-    
+
     DLLEXPORT bool verifyFile( const QString& filePath, const QString& signature );
     DLLEXPORT QString extractScriptPayload( const QString& filename, const QString& resolverId );
     DLLEXPORT bool unzipFileInFolder( const QString& zipFileName, const QDir& folder );
@@ -146,7 +146,7 @@ namespace TomahawkUtils
 
     // Extracting may be asynchronous, pass in a receiver object with the following slots:
     //  extractSucceeded( const QString& path ) and extractFailed() to be notified/
-    DLLEXPORT void extractBinaryResolver( const QString& zipFilename, const QString& resolverId, QObject* receiver );
+    DLLEXPORT void extractBinaryResolver( const QString& zipFilename, QObject* receiver );
 
     // Used by the above, not exported
     void copyWithAuthentication( const QString& srcFile, const QDir dest, QObject* receiver );