1 files changed, 30 insertions, 5 deletions

diff --git a/library/global.cpp b/library/global.cpp
index dd15eb7..5a28595 100644
--- a/library/global.cpp
+++ b/library/global.cpp
@@ -19,64 +19,86 @@
 **********************************************************************/
 #define QTOPIA_INTERNAL_LANGLIST
 #include <qpe/qpedebug.h>
 #include <qpe/global.h>
 #include <qpe/qdawg.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/storage.h>
 #include <qpe/applnk.h>
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
 #include "qpe/qcopenvelope_qws.h"
 #endif
 
 #include <qfile.h>
 #include <qlabel.h>
 #include <qtimer.h>
 #include <qmap.h>
 #include <qdict.h>
 #include <qdir.h>
 #include <qmessagebox.h>
 #include <qregexp.h>
 
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
 
 #include <qwindowsystem_qws.h> // for qwsServer
 #include <qdatetime.h>
 
+#include <qfile.h>
+
+namespace {
+  // checks if the storage should be searched
+  bool checkStorage(const QString &path ){ // this is a small Config replacement cause config is too limited -zecke
+    QFile file(path );
+    if(!file.open(IO_ReadOnly ) )
+       return true;
+    
+    QByteArray array = file.readAll();
+    QStringList list = QStringList::split('\n', QString( array ) );
+    for(QStringList::Iterator it = list.begin(); it != list.end(); ++it ){
+      if( (*it).startsWith("autocheck = 0" ) ){
+        return true;
+      }else if( (*it).startsWith("autocheck = 1" ) ){
+        return false;
+      }
+    }
+    return true;
+  }
+}
+
 //#include "quickexec_p.h"
 
 class Emitter : public QObject {
     Q_OBJECT
 public:
     Emitter( QWidget* receiver, const QString& document )
     {
         connect(this, SIGNAL(setDocument(const QString&)),
             receiver, SLOT(setDocument(const QString&)));
         emit setDocument(document);
         disconnect(this, SIGNAL(setDocument(const QString&)),
                receiver, SLOT(setDocument(const QString&)));
     }
 
 signals:
     void setDocument(const QString&);
 };
 
 
 class StartingAppList : public QObject {
     Q_OBJECT
 public:
     static void add( const QString& name );
     static bool isStarting( const QString name );
 private slots:
     void handleNewChannel( const QString &);
 private:
     StartingAppList( QObject *parent=0, const char* name=0 ) ;
 
     QDict<QTime> dict;
     static StartingAppList *appl;
 };
@@ -609,69 +631,72 @@ QString Global::shellQuote(const QString& s)
   Returns the string \a s with the characters backslash and "
   quoted by a preceeding backslash.
 */
 QString Global::stringQuote(const QString& s)
 {
     QString r="\"";
     for (int i=0; i<(int)s.length(); i++) {
         char c = s[i].latin1();
         switch (c) {
             case '\\': case '"':
                 r+="\\";
         }
         r += s[i];
     }
     r += "\"";
     return r;
 }
 
 /*!
   Finds all documents on the system's document directories which
   match the filter \a mimefilter, and appends the resulting DocLnk
   objects to \a folder.
 */
 void Global::findDocuments(DocLnkSet* folder, const QString &mimefilter)
 {
     QString homedocs = QString(getenv("HOME")) + "/Documents";
     DocLnkSet d(homedocs,mimefilter);
     folder->appendFrom(d);
     StorageInfo storage;
     const QList<FileSystem> &fs = storage.fileSystems();
     QListIterator<FileSystem> it ( fs );
     for ( ; it.current(); ++it ) {
-        if ( (*it)->isRemovable() ) {
-            QString path = (*it)->path();
-            DocLnkSet ide( path, mimefilter );
-            folder->appendFrom(ide);
-        }
+      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;
+        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()
 {
     QStringList path;
     QStringList langs = Global::languageList();
     for (QStringList::ConstIterator it = langs.fromLast(); it!=langs.end(); --it) {
         QString lang = *it;
         if ( !lang.isEmpty() )
             path += QPEApplication::qpeDir() + "/help/" + lang + "/html";
     }
     path += QPEApplication::qpeDir() + "/pics";
     path += QPEApplication::qpeDir() + "/help/en/html";
     path += QPEApplication::qpeDir() + "/docs";
     QString dir = QDir::current().canonicalPath();
     if ( dir == "/" )
         dir += "/docs";