From: Jussi Laitinen <jupe@l3l7588.ixonos.local>
Date: Fri, 30 Jul 2010 08:59:42 +0000 (+0300)
Subject: Added touchscreen enabled flag.
X-Git-Tag: v2.0b-1~116^2~4
X-Git-Url: http://git.maemo.org/git/?a=commitdiff_plain;h=7eaad2f0ea80bde0131774fef14d509743671424;p=situare

Added touchscreen enabled flag.
---

diff --git a/src/engine/mce.h b/src/engine/mce.h
index d053e81..df8c2bb 100644
--- a/src/engine/mce.h
+++ b/src/engine/mce.h
@@ -29,7 +29,7 @@ class MCEPrivate;
 /**
 * @brief MCE class.
 *
-* Mode Control Entity (MCE) listens changes in phone state.
+* Mode Control Entity (MCE) controls phone and listens changes in phone state.
 */
 class MCE : public QObject
 {
diff --git a/src/engine/mceprivate.cpp b/src/engine/mceprivate.cpp
index 4a0c9b2..1816e9a 100644
--- a/src/engine/mceprivate.cpp
+++ b/src/engine/mceprivate.cpp
@@ -37,7 +37,8 @@ static QDBusConnection dBusConnection = QDBusConnection::systemBus();
 
 MCEPrivate::MCEPrivate(QObject *parent)
     : QObject(parent),
-      m_displayOn(true)
+      m_displayOn(true),
+      m_touchscreenVibrationEnabled(false)
 {
     qDebug() << __PRETTY_FUNCTION__;
 
@@ -53,7 +54,9 @@ MCEPrivate::MCEPrivate(QObject *parent)
                                       SLOT(setDisplayState(QString)),
                                       SLOT(displayStateError(QDBusError)));
 
-    if (isTouchscreenVibrationEnabled())
+    m_touchscreenVibrationEnabled = isTouchscreenVibrationEnabled();
+
+    if (m_touchscreenVibrationEnabled)
         m_dBusInterface->call(MCE_ENABLE_VIBRATOR);
 }
 
@@ -130,15 +133,18 @@ void MCEPrivate::vibrationFeedback()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    m_dBusInterface->call(MCE_ACTIVATE_VIBRATOR_PATTERN, "PatternPowerKeyPress");
+    if (m_touchscreenVibrationEnabled) {
+        m_dBusInterface->call(MCE_ACTIVATE_VIBRATOR_PATTERN, "PatternPowerKeyPress");
 
-    const int VIBRATION_TIME = 40;  //Vibration time in milliseconds
-    QTimer::singleShot(VIBRATION_TIME, this, SLOT(stopVibration()));
+        const int VIBRATION_TIME = 40;  //Vibration time in milliseconds
+        QTimer::singleShot(VIBRATION_TIME, this, SLOT(stopVibration()));
+    }
 }
 
 MCEPrivate::~MCEPrivate()
 {
-    qDebug() << __PRETTY_FUNCTION__;
+    qWarning() << __PRETTY_FUNCTION__;
 
-    m_dBusInterface->call(MCE_DISABLE_VIBRATOR);
+    if (m_touchscreenVibrationEnabled)
+        m_dBusInterface->call(MCE_DISABLE_VIBRATOR);
 }
diff --git a/src/engine/mceprivate.h b/src/engine/mceprivate.h
index 11fb32d..b63107a 100644
--- a/src/engine/mceprivate.h
+++ b/src/engine/mceprivate.h
@@ -30,7 +30,7 @@ class MCE;
 /**
 * @brief MCEPrivate class.
 *
-* Mode Control Entity (MCE) listens changes in phone state.
+* Mode Control Entity (MCE) controls phone and listens changes in phone state.
 */
 class MCEPrivate : public QObject
 {
@@ -111,9 +111,10 @@ private slots:
  * DATA MEMBERS
  ******************************************************************************/
 private:
-    bool m_displayOn;                 ///< Flag for display on/off
-    QDBusInterface *m_dBusInterface;  ///< D-Bus interface
-    MCE *m_parent;                    ///< Parent object
+    bool m_displayOn;                   ///< Flag for display on/off
+    bool m_touchscreenVibrationEnabled; ///< Flag for toucscreen vibration enabled
+    QDBusInterface *m_dBusInterface;    ///< D-Bus interface
+    MCE *m_parent;                      ///< Parent object
 };
 
 #endif // MCEPRIVATE_H