| author | kergoth <kergoth> | 2003-03-24 01:24:56 (UTC) |
|---|---|---|
| committer | kergoth <kergoth> | 2003-03-24 01:24:56 (UTC) |
| commit | 1b4836ba28ca57947d37699fc67cddd74fb29fbe (patch) (side-by-side diff) | |
| tree | ce940472f7ca14c5c7f0c88eebcf95ca953cfef9 /core/opie-login | |
| parent | c8205a610f350b8bde7c5aa0522944f0418f1fc9 (diff) | |
| download | opie-1b4836ba28ca57947d37699fc67cddd74fb29fbe.zip opie-1b4836ba28ca57947d37699fc67cddd74fb29fbe.tar.gz opie-1b4836ba28ca57947d37699fc67cddd74fb29fbe.tar.bz2 | |
Remove ifdefs based on device as the means by which we decide to run calibrate, and instead check if the mouse handler inherits from QCalibratedMouseHandler.
| -rw-r--r-- | core/opie-login/main.cpp | 14 |
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 @@ -323,14 +323,14 @@ int login_main ( int argc, char **argv, pid_t ppid ) 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; |