--- a/controlpanel/src/cpframework/src/cpsettingformentryitemdata_p.cpp	Tue May 25 04:13:06 2010 +0800
+++ b/controlpanel/src/cpframework/src/cpsettingformentryitemdata_p.cpp	Thu Jun 10 16:03:48 2010 +0800
@@ -26,8 +26,7 @@
 CpSettingFormEntryItemDataPrivate::CpSettingFormEntryItemDataPrivate()
 : mDataForm(0),
   mItemDataHelper(0),
-  mItemPressed(false), 
-  mDataFormScrolling(false)
+  mItemPressed(false)
 {
     
 }
@@ -35,8 +34,7 @@
 CpSettingFormEntryItemDataPrivate::CpSettingFormEntryItemDataPrivate(CpItemDataHelper *itemDataHelper) 
 : mDataForm(0),
   mItemDataHelper(itemDataHelper),
-  mItemPressed(false), 
-  mDataFormScrolling(false)
+  mItemPressed(false)
 {
     
 }
@@ -44,8 +42,7 @@
 CpSettingFormEntryItemDataPrivate::CpSettingFormEntryItemDataPrivate(HbDataForm *dataForm)
 : mDataForm(dataForm),
   mItemDataHelper(0),
-  mItemPressed(false),
-  mDataFormScrolling(false)
+  mItemPressed(false)
 {
     
 }
@@ -62,13 +59,11 @@
         {
             if (mItemDataHelper) {
                 mItemDataHelper->connectToForm(SIGNAL(pressed (QModelIndex)),mParent,SLOT(_q_itemPressed(QModelIndex)));
-                mItemDataHelper->connectToForm(SIGNAL(released (QModelIndex)),mParent,SLOT(_q_itemReleased(QModelIndex)));
-                mItemDataHelper->connectToForm(SIGNAL(scrollingStarted ()),mParent,SLOT(_q_scrollingStarted()));
+                mItemDataHelper->connectToForm(SIGNAL(activated(QModelIndex)),mParent,SLOT(_q_itemActivated(QModelIndex)));
             }
             else if (mDataForm) {
                 QObject::connect( mDataForm,SIGNAL(pressed(QModelIndex)),mParent,SLOT(_q_itemPressed(QModelIndex)) );
-                QObject::connect( mDataForm,SIGNAL(released(QModelIndex)),mParent,SLOT(_q_itemReleased(QModelIndex)) );
-                QObject::connect( mDataForm,SIGNAL(scrollingStarted()),mParent,SLOT(_q_scrollingStarted()) );
+                QObject::connect( mDataForm,SIGNAL(activated(QModelIndex)),mParent,SLOT(_q_itemActivated(QModelIndex)) );
             }
         }
         break;
@@ -200,18 +195,15 @@
     mItemPressed = ( modelItemFromModelIndex(index) == mParent );
 }
 
-void CpSettingFormEntryItemDataPrivate::_q_itemReleased(const QModelIndex &index)
-{    
-    if (!mDataFormScrolling && mItemPressed && modelItemFromModelIndex(index) == mParent) {
+
+void CpSettingFormEntryItemDataPrivate::_q_itemActivated(const QModelIndex &index)
+{
+    if (mItemPressed && modelItemFromModelIndex(index) == mParent) {
         mParent->onLaunchView();
     }
-    mDataFormScrolling = false;
+    mItemPressed = false;
 }
 
-void CpSettingFormEntryItemDataPrivate::_q_scrollingStarted()
-{
-    mDataFormScrolling = true;
-}
 
 HbDataFormModelItem *CpSettingFormEntryItemDataPrivate::modelItemFromModelIndex(const QModelIndex &index)
 {