3 files changed, 32 insertions, 5 deletions

diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index b26bd8b..dcc3ba1 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -73,6 +73,10 @@
 #include "mediummountgui.h"
 //#define SHOW_ALL
 
+// uidGen
+
+// uidGen
+
 CategoryTabWidget::CategoryTabWidget( QWidget* parent ) :
     QVBox( parent )
 {
@@ -422,7 +426,9 @@ Launcher::Launcher( QWidget* parent, const char* name, WFlags fl )
     tabs = 0;
     rootFolder = 0;
     docsFolder = 0;
-    m_timeStamp = QDateTime::currentDateTime().toString();
+    int stamp = uidgen.generate();
+    uidgen.store( stamp );
+    m_timeStamp = QString::number( stamp  );
 
     tabs = new CategoryTabWidget( this );
     tabs->setMaximumWidth( qApp->desktop()->width() );
@@ -500,38 +506,57 @@ void Launcher::updateMimeTypes(AppLnkSet* folder)
 
 void Launcher::loadDocs() // ok here comes a hack belonging to Global::
 {
+    qWarning("loading Documents" );
+    qWarning("The currentTimeStamp is: %s", m_timeStamp.latin1() );
     delete docsFolder;
     docsFolder = new DocLnkSet;
+    qWarning("new DocLnkSet" );
     // find out wich filesystems are new in this round
     // We will do this by having a timestamp inside each mountpoint
     // if the current timestamp doesn't match this is a new file system and 
     // come up with our MediumMountGui :) let the hacking begin
-    QString newStamp = QDateTime::currentDateTime().toString();
+    int stamp = uidgen.generate();
+    
+    QString newStamp = QString::number( stamp );
+    qWarning("new time stamp is: %s", newStamp.latin1() );
     StorageInfo storage;
     const QList<FileSystem> &fileSystems = storage.fileSystems();
+    qWarning("QList<FileSystem>" );
     QListIterator<FileSystem> it ( fileSystems );
+    qWarning("iterator initiliazed" );
     for ( ; it.current(); ++it ) {
+      qWarning("inside for loop" );
+      qWarning("checking device %s", (*it)->path().latin1() );
       if ( (*it)->isRemovable() ) { // let's find out  if we should search on it
+	qWarning("%s is removeable", (*it)->path().latin1() );
 	OConfig cfg( (*it)->path() + "/.opiestorage.cf");
 	cfg.setGroup("main");
 	QString stamp = cfg.readEntry("timestamp", QDateTime::currentDateTime().toString() );
 	if( stamp == m_timeStamp ){ // ok we know this card
+	  qWarning("time stamp match" );
 	  cfg.writeEntry("timestamp", newStamp );
 	  // we need to scan the list now. Hopefully the cache will be there
 	}else{ // come up with the gui
-	  MediumMountGui medium((*it)->path() + "/.opiestorage.cf" );
+	  qWarning("time stamp doesn't match" );
+	  MediumMountGui medium((*it)->path() );
+	  qWarning("medium mount gui created" );
 	  if( medium.check() ){
+	    qWarning("need to check this device" );
 	    if( medium.exec()  ){ //ok
 	      // speicher
+	      qWarning("execed" );
 	      cfg.writeEntry("timestamp", newStamp );
 	    }
 	  }else{
+	    qWarning("wrong :(" );
 	    // do something different see what we need to do
 	  }
 	} 
       }
     }
+    qWarning("findDocuments" );
     Global::findDocuments(docsFolder); // get rid of this call later
+    qWarning("done" );
     m_timeStamp = newStamp;
 }
 
diff --git a/core/launcher/launcher.h b/core/launcher/launcher.h
index 197bd19..d2efa58 100644
--- a/core/launcher/launcher.h
+++ b/core/launcher/launcher.h
@@ -25,6 +25,7 @@
 #include <qstringlist.h>
 #include <qvbox.h>
 #include <qlist.h>
+#include <qpe/palmtopuidgen.h>
 #include "launcherview.h"
 
 class AppLnk;
@@ -132,6 +133,7 @@ private:
     bool got_lnk_change;
     QString lnk_change;
     QString m_timeStamp;
+    Qtopia::UidGen uidgen;
 };
 
 #endif // LAUNCHERVIEW_H
diff --git a/core/launcher/mediummountgui.cpp b/core/launcher/mediummountgui.cpp
index f193024..6ad97e1 100644
--- a/core/launcher/mediummountgui.cpp
+++ b/core/launcher/mediummountgui.cpp
@@ -21,7 +21,7 @@
 
 
 MediumMountGui::MediumMountGui( const QString &path ,QWidget* parent,  const char* name, bool modal, WFlags fl )
-  : QDialog( parent, name, modal, fl ) {
+  : QDialog( parent, name, true ) {
  
 
   QWidget *d = QApplication::desktop();
@@ -39,7 +39,7 @@ void MediumMountGui::readConfig(){
 
   OConfig cfg (mediumPath +"/.opiestorage.cf");
   cfg.setGroup("main");
-  checkagain = cfg.readBoolEntry("check", false);
+  checkagain = cfg.readBoolEntry("check", true);
   
   cfg.setGroup("mimetypes");
   checkmimeaudio = cfg.readBoolEntry("audio", true);