1 files changed, 12 insertions, 7 deletions

diff --git a/library/global.cpp b/library/global.cpp
index 6c0a66a..6182de8 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -752,55 +752,60 @@ void Global::findDocuments(DocLnkSet* folder, const QString &mimefilter)
      *  a) the user don't want to check mediums global
      *  b) the user wants to check but use the global options for it
      *  c) the user wants to check it but not this medium
      *  d) the user wants to check and this medium as well
      *
      *  In all cases we need to apply a different mimefilter to
      *  the medium.
      *  a) mimefilter.isEmpty() we need to apply the responding filter
      *     either the global or the one on the medium
      *
      *  b) mimefilter is set to an application we need to find out if the
      *     mimetypes are included in the mime mask of the medium
      */
     StorageInfo storage;
     const QList<FileSystem> &fs = storage.fileSystems();
     QListIterator<FileSystem> it ( fs );
     for ( ; it.current(); ++it ) {
       if ( (*it)->isRemovable() ) { // let's find out  if we should search on it
         // this is a candidate look at the cf and see if we should search on it
         QString path = (*it)->path();
         if( !checkStorage((*it)->path() + "/.opiestorage.cf" ) )
           continue;
         Config conf((*it)->path() + "/.opiestorage.cf", Config::File );
         conf.setGroup("subdirs");
-        QStringList subDirs = conf.readListEntry("subdirs",':');
-        if (subDirs.isEmpty()) {
-            subDirs.append("Documents");
-        }
-        for (unsigned c = 0; c < subDirs.count();++c) {
-            DocLnkSet ide( path+"/"+subDirs[c], mimefilter );
-            folder->appendFrom(ide);        
+        if (conf.readBoolEntry("wholemedia",true)) {
+            DocLnkSet ide( path,mimefilter);
+            folder->appendFrom(ide);
+        } else {
+            QStringList subDirs = conf.readListEntry("subdirs",':');
+            if (subDirs.isEmpty()) {
+                subDirs.append("Documents");
+            }
+            for (unsigned c = 0; c < subDirs.count();++c) {
+                DocLnkSet ide( path+"/"+subDirs[c], mimefilter );
+                folder->appendFrom(ide);
+            }
         }
       } else if ( (*it)->disk() == "/dev/mtdblock6" || (*it)->disk() == "tmpfs" ) {
         QString path = (*it)->path() + "/Documents";
         DocLnkSet ide( path, mimefilter );
         folder->appendFrom(ide);
       }
     }
 }
 
 QStringList Global::languageList()
 {
     QString lang = getenv("LANG");
     QStringList langs;
     langs.append(lang);
     int i  = lang.find(".");
     if ( i > 0 )
         lang = lang.left( i );
     i = lang.find( "_" );
     if ( i > 0 )
         langs.append(lang.left(i));
     return langs;
 }
 
 QStringList Global::helpPath()