-rw-r--r-- | library/global.cpp | 19 |
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 | |||
@@ -770,19 +770,24 @@ void Global::findDocuments(DocLnkSet* folder, const QString &mimefilter) | |||
770 | // this is a candidate look at the cf and see if we should search on it | 770 | // this is a candidate look at the cf and see if we should search on it |
771 | QString path = (*it)->path(); | 771 | QString path = (*it)->path(); |
772 | if( !checkStorage((*it)->path() + "/.opiestorage.cf" ) ) | 772 | if( !checkStorage((*it)->path() + "/.opiestorage.cf" ) ) |
773 | continue; | 773 | continue; |
774 | Config conf((*it)->path() + "/.opiestorage.cf", Config::File ); | 774 | Config conf((*it)->path() + "/.opiestorage.cf", Config::File ); |
775 | conf.setGroup("subdirs"); | 775 | conf.setGroup("subdirs"); |
776 | QStringList subDirs = conf.readListEntry("subdirs",':'); | 776 | if (conf.readBoolEntry("wholemedia",true)) { |
777 | if (subDirs.isEmpty()) { | 777 | DocLnkSet ide( path,mimefilter); |
778 | subDirs.append("Documents"); | 778 | folder->appendFrom(ide); |
779 | } | 779 | } else { |
780 | for (unsigned c = 0; c < subDirs.count();++c) { | 780 | QStringList subDirs = conf.readListEntry("subdirs",':'); |
781 | DocLnkSet ide( path+"/"+subDirs[c], mimefilter ); | 781 | if (subDirs.isEmpty()) { |
782 | folder->appendFrom(ide); | 782 | subDirs.append("Documents"); |
783 | } | ||
784 | for (unsigned c = 0; c < subDirs.count();++c) { | ||
785 | DocLnkSet ide( path+"/"+subDirs[c], mimefilter ); | ||
786 | folder->appendFrom(ide); | ||
787 | } | ||
783 | } | 788 | } |
784 | } else if ( (*it)->disk() == "/dev/mtdblock6" || (*it)->disk() == "tmpfs" ) { | 789 | } else if ( (*it)->disk() == "/dev/mtdblock6" || (*it)->disk() == "tmpfs" ) { |
785 | QString path = (*it)->path() + "/Documents"; | 790 | QString path = (*it)->path() + "/Documents"; |
786 | DocLnkSet ide( path, mimefilter ); | 791 | DocLnkSet ide( path, mimefilter ); |
787 | folder->appendFrom(ide); | 792 | folder->appendFrom(ide); |
788 | } | 793 | } |