--- a/policymanagement/policyengine/policyengineserver/src/SettingEnforcementManager.cpp	Tue Jan 26 12:43:57 2010 +0200
+++ b/policymanagement/policyengine/policyengineserver/src/SettingEnforcementManager.cpp	Tue Feb 02 00:44:00 2010 +0200
@@ -23,6 +23,7 @@
 #include "EMailEnforcement.h"
 #include "CommsDatEnforcement.h"
 #include "IMEnforcement.h"
+#include "dcmoenforcement.h"
 #include "datasyncmlenforcement.h"
 #include "ElementBase.h"
 #include "PolicyStorage.h"
@@ -121,7 +122,8 @@
 		if ( CEmailEnforcement::ValidEnforcementElement( *elementName) ||
 			 CCommsDatEnforcement::ValidEnforcementElement( *elementName) ||
 			 CDataSyncMLEnforcement::ValidEnforcementElement( *elementName) ||
-			 CImEnforcement::ValidEnforcementElement(*elementName))	
+			 CImEnforcement::ValidEnforcementElement(*elementName)	||
+			 CDcmoEnforcement::ValidEnforcementElement(*elementName))	
 		{
 			iEnforcementElements.AppendL( elementName->Alloc());
 		}
@@ -315,6 +317,11 @@
 		iActiveEnforcementBase = CImEnforcement::NewL( aEnforcementId);
 	}
 	
+	if ( !iActiveEnforcementBase)
+	{
+		iActiveEnforcementBase = CDcmoEnforcement::NewL( aEnforcementId);
+	}
+	
 	if ( iActiveEnforcementBase )
 	{
 		iActiveEnforcementBase->AccessRightList( iValidEditorsForSetting);