1 files changed, 7 insertions, 7 deletions

diff --git a/core/launcher/main.cpp b/core/launcher/main.cpp
index 8eaea17..64fb968 100644
--- a/core/launcher/main.cpp
+++ b/core/launcher/main.cpp
@@ -81,56 +81,56 @@ int initApplication( int argc, char ** argv )
     QWSServer::setDesktopBackground( QImage() );
     DesktopApplication a( argc, argv, QApplication::GuiServer );
 
 	ODevice::inst ( )-> setSoftSuspend ( true );
 
 	{ // init backlight
 	    QCopEnvelope e("QPE/System", "setBacklight(int)" );
    	 e << -3; // Forced on
 	}
 
     AlarmServer::initialize();
 
     Desktop *d = new Desktop();
 
     QObject::connect( &a, SIGNAL(power()),   d, SLOT(togglePower()) );
     QObject::connect( &a, SIGNAL(backlight()),   d, SLOT(toggleLight()) );
     QObject::connect( &a, SIGNAL(symbol()),   d, SLOT(toggleSymbolInput()) );
     QObject::connect( &a, SIGNAL(numLockStateToggle()),   d, SLOT(toggleNumLockState()) );
     QObject::connect( &a, SIGNAL(capsLockStateToggle()),   d, SLOT(toggleCapsLockState()) );
     QObject::connect( &a, SIGNAL(prepareForRestart()),   d, SLOT(terminateServers()) );
 
     (void)new SysFileMonitor(d);
     Network::createServer(d);
 
-#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
-    if ( !QFile::exists( "/etc/pointercal" ) ) {
-	// Make sure calibration widget starts on top.
-	Calibrate *cal = new Calibrate;
-	cal->exec();
-	delete cal;
+    if ( QWSServer::mouseHandler() ->inherits("QCalibratedMouseHandler") ) {
+	if ( !QFile::exists( "/etc/pointercal" ) ) {
+	    // Make sure calibration widget starts on top.
+	    Calibrate *cal = new Calibrate;
+	    cal->exec();
+	    delete cal;
+	}
     }
-#endif
 
     d->show();
 
 	if ( QDate::currentDate ( ). year ( ) < 2000 ) {
 		if ( QMessageBox::information ( 0, DesktopApplication::tr( "Information" ), DesktopApplication::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 ) {
 			QCopEnvelope e ( "QPE/Application/systemtime", "setDocument(QString)" );
 			e << QString ( );		                              
 		}
 	}
 
     int rv =  a.exec();
 
     delete d;
 
 	ODevice::inst ( )-> setSoftSuspend ( false );
 
     return rv;
 }
 
 static const char *pidfile_path = "/var/run/opie.pid";
 
 void create_pidfile ( )
 {
 	FILE *f;