branches/stable/extragear/multimedia/amarok/src

[Maximilian Kossick]

SVN commit 693227 by mkossick:

read collectionFolders from amarokrc to improve compatibility with kiosk
CCMAIL: krzysiek at lichota.net
CCMAIL: amarok-devel at kde.org


 M  +8 -0      mountpointmanager.cpp  


--- branches/stable/extragear/multimedia/amarok/src/mountpointmanager.cpp #693226:693227
@@ -21,12 +21,14 @@
 #include "debug.h"
 
 #include "amarok.h"
+#include "amarokconfig.h"   //used in init()
 #include "collectiondb.h"
 #include "devicemanager.h"
 #include "mountpointmanager.h"
 #include "pluginmanager.h"
 #include "statusbar.h"
 
+#include <kglobal.h>        //used in init()
 #include <ktrader.h>
 
 #include <qfile.h>
@@ -120,6 +122,12 @@
     {
         mediumChanged( &(*it) );
     }
+    if( !KGlobal::config()->hasGroup( "Collection Folders" ) )
+    {
+        QStringList folders = AmarokConfig::collectionFolders();
+        if( !folders.isEmpty() )
+            setCollectionFolders( folders );
+    }
 }
 
 int