--- a/controlpanelui/src/cpcategorymodel/src/cpcategorymodelutility.cpp	Fri Jun 25 17:12:20 2010 +0800
+++ b/controlpanelui/src/cpcategorymodel/src/cpcategorymodelutility.cpp	Wed Sep 29 10:09:58 2010 +0800
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description:  
+* Description:  Utility class for cpcategorymodel.
 *
 */
 #include "cpcategorymodelutility.h"
@@ -110,7 +110,7 @@
             event->mPluginFile     = pluginConfig.mPluginFile;
                         
             //firstly, handle CpPluginInterface
-            if (CpPluginInterface *plugin = CpPluginLoader().loadCpPluginInterface(pluginConfig.mPluginFile)) {
+            if (CpPluginInterface *plugin = CpPluginLoader::loadCpPluginInterface(pluginConfig.mPluginFile)) {
                 CPFW_LOG("Load  root component CpPluginInterface succeed.");
                 event->mPluginInterface = plugin;
             }
@@ -164,7 +164,7 @@
 		QList<CpSettingFormItemData*> itemDataList;
 		
         //firstly, handle CpPluginInterface
-		if (CpPluginInterface *plugin = CpPluginLoader().loadCpPluginInterface(pluginConfig.mPluginFile)) {
+		if (CpPluginInterface *plugin = CpPluginLoader::loadCpPluginInterface(pluginConfig.mPluginFile)) {
             CPFW_LOG("Load  root component CpPluginInterface succeed.");
 			itemDataList = plugin->createSettingFormItemData(itemDataHelper);
 		}
@@ -181,11 +181,11 @@
             if (itemData) {
                 //append the new created setting form item to its parent item.
                 parent->insertChild(startPosition++,itemData);
-
-                if (CpCategorySettingFormItemData *categoryItemData 
+				//commented this for only loading group plugin when startup
+                /*if (CpCategorySettingFormItemData *categoryItemData 
                     = qobject_cast<CpCategorySettingFormItemData*>(itemData)) {
                     categoryItemData->initialize(itemDataHelper);
-                }
+                }*/
 
                 //set the text and description from config if it is empty.
                 setEntryItemContentIfEmpty(itemData,pluginConfig.mDisplayName,pluginConfig.mDescription);
@@ -212,9 +212,10 @@
     if (entryItemData->description().isEmpty()) {
         entryItemData->setDescription(description);
     }
-    if (entryItemData->iconName().isEmpty()) {
-        entryItemData->setIconName(
-                QLatin1String(":/icon/qgn_prop_set_default_sub.svg") );
+   
+    if (entryItemData->type() == static_cast<HbDataFormModelItem::DataItemType>(CpSettingFormEntryItemData::ListEntryItem)
+        && entryItemData->iconName().isEmpty()) {
+        entryItemData->setIconName(DEFAULT_ICON_LISTENTRYITEM);
     }
     
     return true;