1 files changed, 16 insertions, 5 deletions

diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index 8ed8710..4063517 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -123,95 +123,106 @@ static bool firstUse()
          QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
         if ( !QFile::exists( "/etc/pointercal" ) )
             needFirstUse = TRUE;
     }
 
     {
     Config config( "qpe" );
     config.setGroup( "Startup" );
     needFirstUse |= config.readBoolEntry( "FirstUse", TRUE );
     }
 
     if ( !needFirstUse )
     return FALSE;
 
     FirstUse *fu = new FirstUse();
     fu->exec();
     bool rs = fu->restartNeeded();
     delete fu;
     return rs;
 }
 
 int initApplication( int argc, char ** argv )
 {
     cleanup();
     initEnvironment();
 
 #ifdef QWS
     QWSServer::setDesktopBackground( QImage() );
 #endif
     ServerApplication a( argc, argv, QApplication::GuiServer );
     initKeyboard();
 
-    if ( firstUse() )
+    bool firstUseShown = firstUse();
+    if ( firstUseShown )
     {
         a.restart();
         return 0;
     }
 
     {
         QCopEnvelope e("QPE/System", "setBacklight(int)" );
         e << -3; // Forced on
     }
 
     AlarmServer::initialize();
     Server *s = new Server();
     new SysFileMonitor(s);
 #ifdef QWS
     Network::createServer(s);
 #endif
     s->show();
 
-#if 0
-    if ( QDate::currentDate().year() < 2005 )
+    if ( !firstUseShown ) {
+        Config config( "qpe" );
+        config.setGroup( "Startup" );
+        bool showTimeSettings = config.readBoolEntry( "ShowTimeSettings", FALSE );
+
+        if ( !showTimeSettings && QDate::currentDate().year() < 2007 )
     {
         if ( QMessageBox::information ( 0, ServerApplication::tr( "Information" ),
              ServerApplication::tr( "<p>The system date doesn't seem to be valid.\n(%1)</p><p>Do you want to correct the clock ?</p>" )
-                               .arg( TimeString::dateString( QDate::currentDate())), QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
+                                    .arg( TimeString::dateString( QDate::currentDate())),
+                    QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
+                    {
+                        showTimeSettings = TRUE;
+                    }
+            }
+
+            if ( showTimeSettings )
             {
                 QCopEnvelope e ( "QPE/Application/systemtime", "setDocument(QString)" );
                 e << QString ( );
             }
     }
-#endif
 
     create_pidfile();
     odebug << "--> mainloop in" << oendl;
     int rv = a.exec();
     odebug << "<-- mainloop out" << oendl;
     remove_pidfile();
     odebug << "removing server object..." << oendl;
     delete s;
 
     odebug << "returning from qpe/initapplication..." << oendl;
     return rv;
 }
 
 static const char *pidfile_path = "/var/run/opie.pid";
 
 void create_pidfile()
 {
     FILE *f;
 
     if (( f = ::fopen( pidfile_path, "w" ))) {
         ::fprintf( f, "%d", getpid ( ));
         ::fclose( f );
     }
     else
     {
         odebug << "couldn't create pidfile: " << strerror( errno ) << oendl;
     }
 }
 
 void remove_pidfile()
 {
     ::unlink( pidfile_path );