File load-scrips-without-qca.patch of Package amarok.7817

Overview Repositories Revisions Requests Users Attributes Meta

File load-scrips-without-qca.patch of Package amarok.7817

From: Fabian Vogt <fabian@ritter-vogt.de
Subject: Also load scripts without QCA available

If QCA2 was not found, it skipped loading all scripts...

Index: amarok-2.8.0/src/ScriptManager.cpp
===================================================================
--- amarok-2.8.0.orig/src/ScriptManager.cpp
+++ amarok-2.8.0/src/ScriptManager.cpp
@@ -171,7 +171,6 @@ void
 ScriptManager::updateAllScripts() // SLOT
 {
 // note: we can't update scripts without the QtCryptoArchitecture, so don't even try
-#ifdef QCA2_FOUND
     DEBUG_BLOCK
     // find all scripts (both in $KDEHOME and /usr)
     QStringList foundScripts = KGlobal::dirs()->findAllResources( "data", "amarok/scripts/*/main.js",
@@ -179,6 +178,7 @@ ScriptManager::updateAllScripts() // SLO
                                                                   KStandardDirs::NoDuplicates );
     m_nScripts = foundScripts.count();
 
+#ifdef QCA2_FOUND
     // get timestamp of the last update check
     KConfigGroup config = Amarok::config( "ScriptManager" );
     const uint lastCheck = config.readEntry( "LastUpdateCheck", QVariant( 0 ) ).toUInt();
@@ -205,6 +205,7 @@ ScriptManager::updateAllScripts() // SLO
     }
     // last update was pretty recent, don't check again
     else
+#endif
     {
         debug() << "ScriptUpdater: Skipping update check";
         for ( int i = 0; i < m_nScripts; i++ )
@@ -213,7 +214,6 @@ ScriptManager::updateAllScripts() // SLO
         }
         configChanged( true );
     }
-#endif
 }
 
 void

Places

File load-scrips-without-qca.patch of Package amarok.7817

Places