--- a/sipplugins/sippdevmgmtsipadapter/src/nsmldmsipadapter.cpp Wed Sep 15 12:36:02 2010 +0300
+++ b/sipplugins/sippdevmgmtsipadapter/src/nsmldmsipadapter.cpp Wed Oct 13 14:57:13 2010 +0300
@@ -499,16 +499,6 @@
sigQos.SetDFFormatL( MSmlDmDDFObject::EInt );
sigQos.AddDFTypeMimeTypeL( KNSmlDMSIPTextPlain );
sigQos.SetDescriptionL( KNSmlDMSIPSigQosExp );
-
- //Bearer ID
- MSmlDmDDFObject& bearerid = idNode.AddChildObjectL( KNSmlDMSIPBearerID );
- bearerid.SetAccessTypesL( accessTypesGetReplaceAdd );
- bearerid.SetOccurenceL( MSmlDmDDFObject::EZeroOrOne );
- bearerid.SetScopeL( MSmlDmDDFObject::EDynamic );
- bearerid.SetDFFormatL( MSmlDmDDFObject::EInt );
- bearerid.AddDFTypeMimeTypeL( KNSmlDMSIPTextPlain );
- bearerid.SetDescriptionL( KNSmlDMSIPBearerIDExp );
-
DBG_PRINT("CNSmlDmSIPAdapter::DDFStructureL(): end");
}
@@ -866,22 +856,6 @@
}
}
- // SIP/x/BearerId
- if ( KNSmlDMSIPBearerID() == lastUriSeg )
- {
- TUint32 bearerid = DesToInt( aObject );
- if ( bearerid )
- {
- err = iProfiles->At( profileID )->SetParameter(
- KBearerType, bearerid );
- }
- else
- {
- status = CSmlDmAdapter::EInvalidObject;
- }
- }
-
-
// ==============================
// OutboundProxy settings node
// ==============================
@@ -1286,16 +1260,6 @@
sigQos >>= 2;
segmentResult.Num( sigQos );
}
-
- // SIP/x/BearerId
- if ( KNSmlDMSIPBearerID() == lastUriSeg )
- {
- TUint32 bearerid;
- err = iProfiles->At( profileID )->GetParameter(
- KBearerType, bearerid );
- segmentResult.Num( bearerid );
- }
-
// Set error if fetch failed.
if ( -1 > err )
@@ -1556,12 +1520,6 @@
segmentName );
currentURISegmentList->InsertL( currentURISegmentList->Size(),
KNSmlDMSIPSeparator8 );
-
- segmentName.Copy( KNSmlDMSIPBearerID );
- currentURISegmentList->InsertL( currentURISegmentList->Size(),
- segmentName );
- currentURISegmentList->InsertL( currentURISegmentList->Size(),
- KNSmlDMSIPSeparator8 );
}
// SIP/x/OutboundProxy
@@ -1863,11 +1821,7 @@
}
}
}
-
- if(i < 0)
- return aURI.Left(i+1);
- else
- return aURI.Left( i );
+ return aURI.Left( i );
}
// ---------------------------------------------------------------------------