summaryrefslogtreecommitdiff
authoralwin <alwin>2004-02-22 20:11:56 (UTC)
committer alwin <alwin>2004-02-22 20:11:56 (UTC)
commit936fc191ac5756a4de2e8b2a83c8bc910f918b95 (patch) (side-by-side diff)
tree3b3b3ef8b9abd9ebe1eb9e3180eafe8313bc32d5
parent63e45b90437e78ee11753c6782516dc38c30dd24 (diff)
downloadopie-936fc191ac5756a4de2e8b2a83c8bc910f918b95.zip
opie-936fc191ac5756a4de2e8b2a83c8bc910f918b95.tar.gz
opie-936fc191ac5756a4de2e8b2a83c8bc910f918b95.tar.bz2
read more options from opiestorage.cf
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--library/global.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/library/global.cpp b/library/global.cpp
index 6c0a66a..6182de8 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -768,24 +768,29 @@ void Global::findDocuments(DocLnkSet* folder, const QString &mimefilter)
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");
+ 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);
}
}
}