1 files changed, 7 insertions, 7 deletions

diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index 1800be0..9c40fc4 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -314,32 +314,32 @@ namespace Opie { extern int force_appearance; }  // HACK to get around the force
 int login_main ( int argc, char **argv, pid_t ppid )
 {
         QWSServer::setDesktopBackground( QImage() );
         LoginApplication *app = new LoginApplication ( argc, argv, ppid );
 
         Opie::force_appearance = 0;
 
         app-> setFont ( QFont ( "Helvetica", 10 ));
         app-> setStyle ( new QPEStyle ( ));
 
         ODevice::inst ( )-> setSoftSuspend ( true );
 
-#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
 
         LoginScreenSaver *saver = new LoginScreenSaver;
 
         saver-> setIntervals ( );
         QWSServer::setScreenSaver ( saver );
         saver-> restore ( );
 
 
         LoginWindowImpl *lw = new LoginWindowImpl ( );
         app-> setMainWidget ( lw );
         lw-> setGeometry ( 0, 0, app-> desktop ( )-> width ( ), app-> desktop ( )-> height ( ));
         lw-> show ( );