1 files changed, 9 insertions, 7 deletions

diff --git a/core/launcher/firstuse.cpp b/core/launcher/firstuse.cpp
index 2dc6a72..3f769ae 100644
--- a/core/launcher/firstuse.cpp
+++ b/core/launcher/firstuse.cpp
@@ -31,7 +31,6 @@
 #include "serverapp.h"
 #include <qtopia/custom.h>
-#if defined(QPE_NEED_CALIBRATION)
+
 #include "calibrate.h"
-#endif
 #include "documentlist.h"
 
@@ -169,10 +168,14 @@ FirstUse::FirstUse(QWidget* parent, const char * name, WFlags wf) :
 #endif
     calcMaxWindowRect();
-#if defined(QPE_NEED_CALIBRATION)
+
+    m_calHandler = ( QWSServer::mouseHandler() && QWSServer::mouseHandler()->inherits("QCalibratedMouseHandler") ) ? true : false;
+
+    if ( m_calHandler) {
     if ( !QFile::exists("/etc/pointercal") ) {
         needCalibrate = TRUE;
         grabMouse();
     }
-#endif
+    }
+
     Config config("locale");
     config.setGroup( "Language");
@@ -492,4 +495,5 @@ void FirstUse::updateButtons()
     else
         next->setText(tr("Next >>"));
+
     next->setEnabled( !waitingForLaunch );
 }
@@ -505,6 +509,5 @@ void FirstUse::mouseReleaseEvent( QMouseEvent * )
 {
     if ( currApp < 0 ) {
-#if defined(QPE_NEED_CALIBRATION)
-        if ( needCalibrate ) {
+        if ( m_calHandler && needCalibrate ) {
             releaseMouse();
             Calibrate *cal = new Calibrate;
@@ -512,5 +515,4 @@ void FirstUse::mouseReleaseEvent( QMouseEvent * )
             delete cal;
         }
-#endif
         nextDialog();
     }