--- a/cmmanager/cmmgr/cmmserver/src/cmmdestinationstruct.cpp	Fri May 14 16:15:46 2010 +0300
+++ b/cmmanager/cmmgr/cmmserver/src/cmmdestinationstruct.cpp	Thu May 27 13:17:01 2010 +0300
@@ -211,7 +211,7 @@
         // Not found -> fill in with default values.
         iMetadataRecord->iSNAP = iId;
         iMetadataRecord->iMetadata = 0;
-        iMetadataRecord->iIcon = 0;
+        //iMetadataRecord->iIcon = 0;//TODO, set to 0 or not?
         iMetadataRecord->SetRecordId( KCDNewRecordRequest );
         iMetadataRecordStatus = ECmmRecordStatusUnsaved;
         }
@@ -836,7 +836,7 @@
                     {
                     // Normal connection method.
                     snapRecord2->iEmbeddedSNAP = 0;
-                    snapRecord2->iIAP = ( KCDMaskShowField & CommsDat::KCDTIdIAPRecord ) | ( connMethodRealId << 8 );
+                    snapRecord2->iIAP = CommsDat::KCDTIdIAPRecord | ( connMethodRealId << 8 );
                     snapRecord2->iPriority = i + 1; // Priority values start from 1.
                     aDestinationInstance.iConnMethodItemArray[i].iPriority = i + 1; // Update this just in case.
                     }
@@ -1333,6 +1333,10 @@
                 {
                 metadataRecord->iIcon.SetL( source->iIcon );
                 }
+            //if ( !source->iIconFileName.IsNull() )//TODO, enable after commsdat icon changes are implemented.
+                //{
+                //metadataRecord->iIconFileName.SetL( source->iIconFileName );
+                //}
             metadataRecord->SetElementId( source->ElementId() );
 
             CleanupStack::Pop( metadataRecord );