# HG changeset patch
# User hgs
# Date 1283519060 -10800
# Node ID df048d343f83c87fd50cb6699b7cc57b283a0c02
# Parent 2625ef7905cb030622c1da07941df75d2b587a60
201035
diff -r 2625ef7905cb -r df048d343f83 commondrm/drmrightsmanagerui/src/DRMRightsMgrAppUi.cpp
--- a/commondrm/drmrightsmanagerui/src/DRMRightsMgrAppUi.cpp Fri Aug 20 16:05:06 2010 +0300
+++ b/commondrm/drmrightsmanagerui/src/DRMRightsMgrAppUi.cpp Fri Sep 03 16:04:20 2010 +0300
@@ -220,10 +220,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;
}
diff -r 2625ef7905cb -r df048d343f83 commondrm/drmutility/src/drmutilitywmdrmwrapper.cpp
--- a/commondrm/drmutility/src/drmutilitywmdrmwrapper.cpp Fri Aug 20 16:05:06 2010 +0300
+++ b/commondrm/drmutility/src/drmutilitywmdrmwrapper.cpp Fri Sep 03 16:04:20 2010 +0300
@@ -577,7 +577,7 @@
// call given HandleErrorObserver
if( value > 0 )
{
- aObserver->RightsAvailable( aOperationId, KErrNone );
+ CallRightsAvailable( aObserver, aOperationId, KErrNone );
}
}
CleanupStack::PopAndDestroy( &file );
diff -r 2625ef7905cb -r df048d343f83 drm_plat/drm_common_api/tsrc/data/mmc/DRM/content.dcf
diff -r 2625ef7905cb -r df048d343f83 drm_plat/drm_rights_api/tsrc/data/c/content.dcf
diff -r 2625ef7905cb -r df048d343f83 drm_pub/oma_drm_caf_agent_api/tsrc/bc/DRM_CAF/data/content.dcf
diff -r 2625ef7905cb -r df048d343f83 package_definition.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/package_definition.xml Fri Sep 03 16:04:20 2010 +0300
@@ -0,0 +1,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -r 2625ef7905cb -r df048d343f83 package_map.xml
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/package_map.xml Fri Sep 03 16:04:20 2010 +0300
@@ -0,0 +1,1 @@
+
diff -r 2625ef7905cb -r df048d343f83 wmdrm/camese/wmdrmdlaapp/src/wmdrmdlabrowserview.cpp
--- a/wmdrm/camese/wmdrmdlaapp/src/wmdrmdlabrowserview.cpp Fri Aug 20 16:05:06 2010 +0300
+++ b/wmdrm/camese/wmdrmdlaapp/src/wmdrmdlabrowserview.cpp Fri Sep 03 16:04:20 2010 +0300
@@ -22,7 +22,6 @@
#include
#include
#include
-#include
#include
#include "wmdrmdlabrowserview.h"
#include "wmdrmdlabrowsercontainer.h"
@@ -41,7 +40,6 @@
void CWmDrmDlaBrowserView::ConstructL()
{
BaseConstructL( R_WMDRMDLA_APP_BROWSER_VIEW );
- iConMgr = CInternetConnectionManager::NewL( ETrue );
}
// ---------------------------------------------------------------------------
@@ -85,7 +83,6 @@
{
RemoveContainer();
delete iLicenseResponse;
- delete iConMgr;
}
// ---------------------------------------------------------------------------