2 files changed, 5 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 9b31725..2b7bc35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,23 +1,24 @@
         2005-??-??Opie 1.2.0
 
         New Features
         ------------
         * Number of icon columns in Launcher is customizable through Launcher.conf (hrw,zecke,mickeyl)
         * Number of icon columns in Launcher is customizable through LauncherSettings (mickeyl)
 
         Fixed Bugs
         ----------
         * #1501 - Fixed bug in todo sql backend (eilers)
-        * n.a - Removed hard coded font sizes in a couple of inputmethods (mickeyl)
+        * n.a. - Removed hard coded font sizes in a couple of inputmethods (mickeyl)
+        * n.a. - Removed MediumDlg appearing prior to FirstUsage wizard (i.e. calibration) (mickeyl)
 
         Internal
         --------
         * Added the Qtopia 1.7 SDK macros for quick-apps to easa compilation of 3rd party apps against our headers (mickeyl)
 
         2004-11-26Opie 1.1.8
 
         New Features
         ------------
         * PackageManager supports installation of local ipkg files (drw)
         * PackageManager supports linking of applications to root (drw)
         * PackageManager supports src/gz feeds (drw,wimpie)
diff --git a/core/launcher/documentlist.cpp b/core/launcher/documentlist.cpp
index 9781a32..d2b9afa 100644
--- a/core/launcher/documentlist.cpp
+++ b/core/launcher/documentlist.cpp
@@ -537,27 +537,29 @@ DocumentListPrivate::DocumentListPrivate( ServerInterface *gui )
     }
     for ( int i = 0; i < MAX_SEARCH_DEPTH; i++ ) {
     listDirs[i] = 0;
     lists[i] = 0;
     listPositions[i] = 0;
     }
     initialize();
     tid = 0;
 }
 
 void DocumentListPrivate::appendDocpath(FileSystem*fs)
 {
+    Config c( "qpe" );
+    c.setGroup( "Startup" );
     QDir defPath(fs->path()+"/Documents");
     QFileInfo f(fs->path()+"/.opiestorage.cf");
-    if (!f.exists()) {
+    if ( c.readNumEntry( "FirstUse", 42 ) == 0 && !f.exists()) {
         Mediadlg dlg(fs);
         if (QDialog::Accepted != QPEApplication::execDialog( &dlg )) {
             return;
         }
     }
     Config conf(f.filePath(), Config::File );
     conf.setGroup("main");
     if (!conf.readBoolEntry("check",false)) {
         return;
     }
     conf.setGroup("subdirs");
     bool read_all = conf.readBoolEntry("wholemedia",true);