fix the bugs

3 files changed, 47 insertions, 36 deletions

diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index d1df4cc..f9c6c02 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -559,2 +559,4 @@ void Launcher::loadDocs() // ok here comes a hack belonging to Global::
     QListIterator<FileSystem> it ( fileSystems );
+
+
     for ( ; it.current(); ++it ) {
@@ -575,3 +577,3 @@ void Launcher::loadDocs() // ok here comes a hack belonging to Global::
         }else{ // come up with the gui cause this a new card
-          MediumMountGui medium((*it)->path() );
+          MediumMountGui medium(&cfg, (*it)->path() );
           if( medium.check() ){ // we did not ask before or ask again is off
@@ -579,4 +581,8 @@ void Launcher::loadDocs() // ok here comes a hack belonging to Global::
               // speicher
-              cfg.read(); // cause of a race we need to reread
+              //cfg.read(); // cause of a race we need to reread - fixed
               cfg.writeEntry("timestamp", newStamp );
+              cfg.write();
+              tmp = new DocLnkSet( (*it)->path(), medium.mimeTypes().join(";" ) );
+              docsFolder->appendFrom( *tmp );
+              delete tmp;
             }// no else
diff --git a/core/launcher/mediummountgui.cpp b/core/launcher/mediummountgui.cpp
index e0acf4e..8cc2411 100644
--- a/core/launcher/mediummountgui.cpp
+++ b/core/launcher/mediummountgui.cpp
@@ -16,2 +16,4 @@
 #include <qpe/resource.h>
+#include <qpe/config.h>
+
 #include <opie/oconfig.h>
@@ -22,6 +24,6 @@
 
-MediumMountGui::MediumMountGui( const QString &path ,QWidget* parent,  const char* name, bool modal, WFlags fl )
+MediumMountGui::MediumMountGui( Config *cfg, const QString &path ,QWidget* parent,  const char* name, bool , WFlags  )
   : QDialog( parent, name, true ) {
  
-
+  m_cfg = cfg;
   QWidget *d = QApplication::desktop();
@@ -39,15 +41,15 @@ void MediumMountGui::readConfig(){
 
-  OConfig cfg (mediumPath +"/.opiestorage.cf");
-  cfg.setGroup("main");
-  checkagain = cfg.readBoolEntry("check", false);
+  //OConfig cfg (mediumPath +"/.opiestorage.cf");
+  m_cfg->setGroup("main");
+  checkagain = m_cfg->readBoolEntry("check", false);
   
-  cfg.setGroup("mimetypes");
-  checkmimeaudio = cfg.readBoolEntry("audio", true);
-  checkmimeimage = cfg.readBoolEntry("image", true);
-  checkmimetext  = cfg.readBoolEntry("text", true);
-  checkmimevideo = cfg.readBoolEntry("video", true);
-  checkmimeall   = cfg.readBoolEntry("all", true);
-
-  cfg.setGroup("dirs");
-  limittodirs = cfg.readEntry("dirs", "");
+  m_cfg->setGroup("mimetypes");
+  checkmimeaudio = m_cfg->readBoolEntry("audio", true);
+  checkmimeimage = m_cfg->readBoolEntry("image", true);
+  checkmimetext  = m_cfg->readBoolEntry("text", true);
+  checkmimevideo = m_cfg->readBoolEntry("video", true);
+  checkmimeall   = m_cfg->readBoolEntry("all", true);
+
+  m_cfg->setGroup("dirs");
+  limittodirs = m_cfg->readEntry("dirs", "");
 }
@@ -65,17 +67,17 @@ void MediumMountGui::writeConfig(bool autocheck) {
 
-  OConfig cfg (mediumPath +"/.opiestorage.cf");
-  cfg.setGroup("main");
-  cfg.writeEntry("check",  AskBox->isChecked() );
-  cfg.writeEntry("autocheck", autocheck );  
+  //OConfig cfg (mediumPath +"/.opiestorage.cf");
+  m_cfg->setGroup("main");
+  m_cfg->writeEntry("check",  AskBox->isChecked() );
+  m_cfg->writeEntry("autocheck", autocheck );  
 
-  cfg.setGroup("mimetypes");
+  m_cfg->setGroup("mimetypes");
 
-  cfg.writeEntry("audio", CheckBoxAudio->isChecked() );
-  cfg.writeEntry("image",CheckBoxImage->isChecked() );
-  cfg.writeEntry("text",CheckBoxImage->isChecked() );
-  cfg.writeEntry("video",CheckBoxVideo->isChecked() );
-  cfg.writeEntry("all",CheckBoxAll->isChecked() );
+  m_cfg->writeEntry("audio", CheckBoxAudio->isChecked() );
+  m_cfg->writeEntry("image",CheckBoxImage->isChecked() );
+  m_cfg->writeEntry("text",CheckBoxImage->isChecked() );
+  m_cfg->writeEntry("video",CheckBoxVideo->isChecked() );
+  m_cfg->writeEntry("all",CheckBoxAll->isChecked() );
 
-  cfg.setGroup("dirs");
-  cfg.writeEntry("dirs", ""); 
+  m_cfg->setGroup("dirs");
+  m_cfg->writeEntry("dirs", ""); 
 
@@ -100,3 +102,3 @@ void MediumMountGui::writeConfig(bool autocheck) {
   }
-  cfg.write(); // not really needed here but just to be sure
+  m_cfg->write(); // not really needed here but just to be sure
 }
diff --git a/core/launcher/mediummountgui.h b/core/launcher/mediummountgui.h
index 2e04f94..8292c3a 100644
--- a/core/launcher/mediummountgui.h
+++ b/core/launcher/mediummountgui.h
@@ -13,2 +13,3 @@ class QLineEdit;
 class QPushButton;
+class Config;
 
@@ -19,3 +20,3 @@ class MediumMountGui : public QDialog
 public:
-    MediumMountGui( const QString &path = "tmp/", QWidget* parent = 0, const char* name = 0, bool modal = FALSE    ,WFlags fl = 0 );
+    MediumMountGui( Config *cfg, const QString &path = "tmp/", QWidget* parent = 0, const char* name = 0, bool modal = FALSE    ,WFlags fl = 0 );
     ~MediumMountGui();
@@ -39,2 +40,3 @@ protected:
     QCheckBox* AskBox;
+   
 
@@ -56,10 +58,11 @@ private slots:
 
-    bool checkagain; 
-    bool checkmimeaudio;
-    bool checkmimeimage;
-    bool checkmimetext;
-    bool checkmimevideo;
-    bool checkmimeall;
+    bool checkagain:1; 
+    bool checkmimeaudio:1;
+    bool checkmimeimage:1;
+    bool checkmimetext:1;
+    bool checkmimevideo:1;
+    bool checkmimeall:1;
     QString limittodirs;
     QStringList mimeTypeList;
+    Config *m_cfg;