--- a/cmmanager/cpdestinationplugin/src/cpdestinationgroup.cpp	Thu May 13 23:10:21 2010 +0300
+++ b/cmmanager/cpdestinationplugin/src/cpdestinationgroup.cpp	Thu May 13 23:17:48 2010 +0300
@@ -23,6 +23,7 @@
 #include <HbDataform>
 #include <HbDataFormModel>
 #include <HbDataFormViewItem>
+#include <HbParameterLengthLimiter>
 #include <cpbasesettingview.h>
 #include <cpitemdatahelper.h>
 #include <cpsettingformentryitemdataimpl.h>
@@ -134,10 +135,6 @@
     destDataItem->setDestinationName(dest);
     connect(destDataItem, SIGNAL(destChanged()), this, SLOT(updateDestinationInformation()));
     
-    // Use ItemDataHelper to make connections
-    QObject* form = QObject::parent()->parent();
-    mItemDataHelper->bindToForm(static_cast<HbDataForm*>(form));
-    
     // Insert Child to correct position
     QList<QSharedPointer<CmDestinationShim> > destinationList;
     fetchDestinations(destinationList);
@@ -236,13 +233,6 @@
         destDataItem->setContentWidgetData(QString("additionalText"), iapCount);
         destDataItem->setContentWidgetData(QString("text"), destDataItem->destinationName());
     }
-    // Update UI
-    HbDataForm *form = static_cast<HbDataForm*>(QObject::parent()->parent());
-    HbDataFormModel* model = static_cast<HbDataFormModel*>(QObject::parent());
-    QModelIndex index = model->indexFromItem(this);
-    HbDataFormViewItem *viewItem = static_cast<HbDataFormViewItem *>(form->itemByIndex(index));
-    viewItem->setExpanded(false);
-    viewItem->setExpanded(true);
     OstTraceFunctionExit0(CPDESTINATIONGROUP_UPDATEDESTINATIONINFORMATION_EXIT);
 }
 
@@ -336,7 +326,8 @@
     OstTraceFunctionEntry0(CPDESTINATIONGROUP_GETDESTINATIONADDITIONALTEXT_ENTRY);
     QString result = "";
     if (iapCount > 0) {
-        result = hbTrId("txt_occ_dblist_internet_val_ln_access_points", iapCount);
+        //result = hbTrId("txt_occ_dblist_internet_val_ln_access_points", iapCount);
+        result = HbParameterLengthLimiter("txt_occ_dblist_internet_val_ln_access_points").arg(iapCount);
     } else {
         result = hbTrId("txt_occ_dblist_internet_val_no_access_points");
     }