# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1284543023 -10800
# Node ID e9463401011bec25c90d15b1c7e81161b173db3c
# Parent  00671737faf248b3a6ce754d640ed6c6a163c4d5
Revision: 201034
Kit: 201036

diff -r 00671737faf2 -r e9463401011b commondrm/drmrightsmanagerui/src/DRMRightsMgrAppUi.cpp
--- a/commondrm/drmrightsmanagerui/src/DRMRightsMgrAppUi.cpp	Tue Sep 14 21:50:40 2010 +0300
+++ b/commondrm/drmrightsmanagerui/src/DRMRightsMgrAppUi.cpp	Wed Sep 15 12:30:23 2010 +0300
@@ -35,7 +35,6 @@
 #include <coeutils.h>
 #include <eikserverapp.h>
 
-
 #include <starterclient.h>
 
 // character conversions
@@ -220,10 +219,10 @@
     {
     TChar charCode( aKeyEvent.iCode );
 
-    if ( charCode == EKeyEnter )
+    if ( aKeyEvent.iScanCode ==  EStdKeyEnter )
         // Default is to show details
         {
-        TInt command = EDRMRightsManagerCmdAppViewDet;
+        TInt command = EAknSoftkeyClose;
         HandleCommandL( command );
         return EKeyWasConsumed;
         }
@@ -255,12 +254,10 @@
             }
         case EAknSoftkeyClose:
             {
-
             if (server)
                 {
                 server->NotifyServerExit(EAknSoftkeyClose);
                 }
-                
             Exit();
             break;
             }    
diff -r 00671737faf2 -r e9463401011b commondrm/drmrightsmanagerui/src/DRMRightsMgrDetailsView.cpp
--- a/commondrm/drmrightsmanagerui/src/DRMRightsMgrDetailsView.cpp	Tue Sep 14 21:50:40 2010 +0300
+++ b/commondrm/drmrightsmanagerui/src/DRMRightsMgrDetailsView.cpp	Wed Sep 15 12:30:23 2010 +0300
@@ -437,6 +437,7 @@
     iDetails.iIndividualConstraint = aIndividualConstraint;
     iDetails.iUsageAllowed = aUsageAllowed;
     iDetails.iActiveROindex = 0;
+    DeleteConstraints();
     iDetails.iRights->Reset();
     iDetails.iDrmScheme = aDrmScheme;
 
diff -r 00671737faf2 -r e9463401011b commondrm/drmutility/src/drmutilitywmdrmwrapper.cpp
--- a/commondrm/drmutility/src/drmutilitywmdrmwrapper.cpp	Tue Sep 14 21:50:40 2010 +0300
+++ b/commondrm/drmutility/src/drmutilitywmdrmwrapper.cpp	Wed Sep 15 12:30:23 2010 +0300
@@ -598,7 +598,7 @@
             // call given HandleErrorObserver
             if( value > 0 )
                 {
-                aObserver->RightsAvailable( aOperationId, KErrNone );              
+                CallRightsAvailable( aObserver, aOperationId, KErrNone );              
                 }
             }
         CleanupStack::PopAndDestroy( &file );
diff -r 00671737faf2 -r e9463401011b drm_plat/drm_common_api/tsrc/data/mmc/DRM/content.dcf
diff -r 00671737faf2 -r e9463401011b drm_plat/drm_rights_api/tsrc/data/c/content.dcf
diff -r 00671737faf2 -r e9463401011b drm_pub/oma_drm_caf_agent_api/tsrc/bc/DRM_CAF/data/content.dcf