summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/global.cpp19
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
@@ -764,31 +764,36 @@ void Global::findDocuments(DocLnkSet* folder, const QString &mimefilter)
764 */ 764 */
765 StorageInfo storage; 765 StorageInfo storage;
766 const QList<FileSystem> &fs = storage.fileSystems(); 766 const QList<FileSystem> &fs = storage.fileSystems();
767 QListIterator<FileSystem> it ( fs ); 767 QListIterator<FileSystem> it ( fs );
768 for ( ; it.current(); ++it ) { 768 for ( ; it.current(); ++it ) {
769 if ( (*it)->isRemovable() ) { // let's find out if we should search on it 769 if ( (*it)->isRemovable() ) { // let's find out if we should search on it
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 }
789 } 794 }
790} 795}
791 796
792QStringList Global::languageList() 797QStringList Global::languageList()
793{ 798{
794 QString lang = getenv("LANG"); 799 QString lang = getenv("LANG");