Don't show spotify config widget unless we have a resolver

admin/mac/macdeploy.py

@@ -206,7 +206,7 @@ TOMAHAWK_PLUGINS = [
 ]
 
 QT_PLUGINS_SEARCH_PATH=[
-    '/usr/local/Cellar/qt/4.7.4/plugins',
+    '/usr/local/Cellar/qt/4.8.0/plugins',
 ]
 
 

src/accounts/spotify/SpotifyAccount.cpp

@@ -585,6 +585,9 @@ SpotifyAccount::icon() const
 QWidget*
 SpotifyAccount::configurationWidget()
 {
+    if ( m_spotifyResolver.isNull() )
+        return 0;
+
     if ( m_configWidget.isNull() )
     {
         m_configWidget = QWeakPointer< SpotifyAccountConfig >( new SpotifyAccountConfig( this ) );

src/libtomahawk/AtticaManager.cpp

@@ -200,12 +200,14 @@ AtticaManager::resolvers() const
 Content
 AtticaManager::resolverForId( const QString& id ) const
 {
+    qDebug() << "Asked for resolver for id:" << id;
     foreach ( const Attica::Content& c, m_resolvers )
     {
         if ( c.id() == id )
             return c;
     }
 
+    qDebug() << "Not found!";
     return Content();
 }
 
@@ -214,6 +216,10 @@ AtticaManager::resolverForId( const QString& id ) const
 AtticaManager::ResolverState
 AtticaManager::resolverState ( const Content& resolver ) const
 {
+    qDebug() << Q_FUNC_INFO << "Returning resolver state for resolver:" << resolver .id() << "known?" << m_resolverStates.contains( resolver.id() );
+    if ( m_resolverStates.contains( resolver.id() ) )
+        qDebug() << "KNOWN and stateL" << m_resolverStates[ resolver.id() ].state;
+
     if ( !m_resolverStates.contains( resolver.id() ) )
     {
         return AtticaManager::Uninstalled;

src/libtomahawk/mac/FileHelpers.mm

@@ -76,8 +76,6 @@ static BOOL AuthorizationExecuteWithPrivilegesAndWait(AuthorizationRef authoriza
 
 + (void) moveFile:(NSString *)source to:(NSString*)dest withDelegate:delegate
 {
-    NSLog(@"FileHelpers moving file from %@ to %@", source, dest);
-
     NSDictionary *info = [NSDictionary dictionaryWithObjectsAndKeys:source, TKCopySourceKey, dest, TKCopyDestinationKey, delegate, TKInstallerDelegateKey, nil];
     [NSThread detachNewThreadSelector:@selector(performMoveWithInfo:) toTarget:self withObject:info];
 }

src/libtomahawk/utils/TomahawkUtils_Mac.mm

@@ -58,6 +58,8 @@
         NSLog( @"Failed to do chmod +x of moved resolver! %@", [[error userInfo] objectForKey: NSLocalizedDescriptionKey] );
     }
 
+    qDebug() << "Successfully install tomahawk resolver with path:" << path;
+
     if ( receiver )
         QMetaObject::invokeMethod(receiver, "installSucceeded", Qt::DirectConnection, Q_ARG(QString, path));
 

src/main.cpp

@@ -147,7 +147,7 @@ main( int argc, char *argv[] )
 
 #ifndef ENABLE_HEADLESSs
 #ifdef WITH_BREAKPAD
-    new BreakPad( QDir::tempPath(), TomahawkSettings::instance()->crashReporterEnabled() );
+    //new BreakPad( QDir::tempPath(), TomahawkSettings::instance()->crashReporterEnabled() );
 #endif
 #endif