--- 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;
}
--- 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 );
--- /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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="drm" name="DRM" levels="plugin framework server generic specific">
+ <collection id="drm_plat" name="DRM Platform Interfaces" level="specific">
+ <component id="roap_api" name="ROAP API" class="api" filter="s60">
+ <meta rel="Api" href="drm_plat/roap_api/roap_api.metaxml"/>
+ <unit bldFile="drm_plat/roap_api/group"/>
+ </component>
+ <component id="drm_common_api" name="DRM Common API" class="api" filter="s60">
+ <meta rel="Api" href="drm_plat/drm_common_api/drm_common_api.metaxml"/>
+ <unit bldFile="drm_plat/drm_common_api/group"/>
+ </component>
+ <component id="drm_rights_api" name="DRM Rights API" class="api" filter="s60">
+ <meta rel="Api" href="drm_plat/drm_rights_api/drm_rights_api.metaxml"/>
+ <unit bldFile="drm_plat/drm_rights_api/group"/>
+ </component>
+ <component id="drm_legacy_api" name="DRM Legacy API" class="api" filter="s60">
+ <meta rel="Api" href="drm_plat/drm_legacy_api/drm_legacy_api.metaxml"/>
+ <unit bldFile="drm_plat/drm_legacy_api/group"/>
+ </component>
+ <component id="dcf_repository_api" name="DCF Repository API" class="api" filter="s60">
+ <meta rel="Api" href="drm_plat/dcf_repository_api/dcf_repository_api.metaxml"/>
+ <unit bldFile="drm_plat/dcf_repository_api/group"/>
+ </component>
+ <component id="drm_service_api" name="DRM Service API" class="api" filter="s60">
+ <meta rel="Api" href="drm_plat/drm_service_api/drm_service_api.metaxml"/>
+ <unit bldFile="drm_plat/drm_service_api/group"/>
+ </component>
+ <component id="drm_secondary_display_api" name="DRM Secondary Display API" class="api" filter="s60">
+ <meta rel="Api" href="drm_plat/drm_secondary_display_api/drm_secondary_display_api.metaxml"/>
+ <unit bldFile="drm_plat/drm_secondary_display_api/group"/>
+ </component>
+ <component id="drm_license_manager_api" name="DRM License Manager API" class="api" filter="s60">
+ <meta rel="Api" href="drm_plat/drm_license_manager_api/drm_license_manager_api.metaxml"/>
+ <unit bldFile="drm_plat/drm_license_manager_api/group"/>
+ </component>
+ <component id="drm_utility_api" name="DRM Utility API" class="api" filter="s60">
+ <meta rel="Api" href="drm_plat/drm_utility_api/drm_utility_api.metaxml"/>
+ <unit bldFile="drm_plat/drm_utility_api/group"/>
+ </component>
+ <component id="drm_agents_api" name="DRM Agents API" class="api" filter="s60">
+ <meta rel="Api" href="drm_plat/drm_agents_api/drm_agents_api.metaxml"/>
+ <unit bldFile="drm_plat/drm_agents_api/group"/>
+ </component>
+ <component id="wmdrm_core_api" name="WM DRM Core API" class="api" filter="s60">
+ <meta rel="Api" href="drm_plat/wmdrm_core_api/wmdrm_core_api.metaxml"/>
+ <unit bldFile="drm_plat/wmdrm_core_api/group"/>
+ </component>
+ <component id="wmdrm_access_api" name="WM DRM Access API" class="api" filter="s60">
+ <meta rel="Api" href="drm_plat/wmdrm_access_api/wmdrm_access_api.metaxml"/>
+ <unit bldFile="drm_plat/wmdrm_access_api/group"/>
+ </component>
+ <component id="wmdrm_ota_access_api" name="WM DRM OTA Access API" class="api" filter="s60">
+ <meta rel="Api" href="drm_plat/wmdrm_ota_access_api/wmdrm_ota_access_api.metaxml"/>
+ <unit bldFile="drm_plat/wmdrm_ota_access_api/group"/>
+ </component>
+ <component id="camese_utility_api" name="Camese Utility API" class="api" filter="s60">
+ <meta rel="Api" href="drm_plat/camese_utility_api/camese_utility_api.metaxml"/>
+ <meta rel="config">
+ <defined condition="__WINDOWS_MEDIA_DRM"/>
+ </meta>
+ <unit bldFile="drm_plat/camese_utility_api/group"/>
+ </component>
+ <component id="camese_framework_api" name="Camese Framework API" class="api" filter="s60">
+ <meta rel="Api" href="drm_plat/camese_framework_api/camese_framework_api.metaxml"/>
+ <meta rel="config">
+ <defined condition="__WINDOWS_MEDIA_DRM"/>
+ </meta>
+ <unit bldFile="drm_plat/camese_framework_api/group"/>
+ </component>
+ </collection>
+ <collection id="drm_pub" name="DRM Public Interfaces" level="specific">
+ <component id="drm_helper_api" name="DRM Helper API" class="api" filter="s60">
+ <meta rel="Api" href="drm_pub/drm_helper_api/drm_helper_api.metaxml"/>
+ <unit bldFile="drm_pub/drm_helper_api/group"/>
+ </component>
+ <component id="oma_drm_caf_agent_api" name="OMA DRM CAF Agent API" class="api" filter="s60">
+ <meta rel="Api" href="drm_pub/oma_drm_caf_agent_api/oma_drm_caf_agent_api.metaxml"/>
+ <unit bldFile="drm_pub/oma_drm_caf_agent_api/group"/>
+ </component>
+ <component id="drm_license_checker_api" name="DRM License Checker API" class="api" filter="s60">
+ <meta rel="Api" href="drm_pub/drm_license_checker_api/drm_license_checker_api.metaxml"/>
+ <unit bldFile="drm_pub/drm_license_checker_api/group"/>
+ </component>
+ </collection>
+ <collection id="commondrm" name="Common DRM" level="generic">
+ <!-- it looks like this collection would be better as a component. If so, move down a directory. Otherwise, split up the bld.inf -->
+ <component id="drmqtencryptor" filter="s60" name="DRM Qt Encryptor" introduced="^4">
+ <unit bldFile="commondrm/drmqtencryptor" qt:proFile="qt_drmencryptor.pro" />
+ </component>
+ <component id="drmrightsmanagerui" filter="s60" name="DRM Rights Manager UI">
+ <unit bldFile="commondrm/drmrightsmanagerui/help/group"/>
+ </component>
+ <component id="drmutility" filter="s60" name="DRM Utility">
+ <unit bldFile="commondrm/drmutility/group"/>
+ </component>
+ <component id="drmserviceapiwrapper" filter="s60" name="DRM Service API Wrapper">
+ <unit bldFile="commondrm/drmserviceapiwrapper/group"/>
+ </component>
+ <component id="drmrightsstoringlocation" filter="s60" name="DRM Rights Storing Location">
+ <unit bldFile="commondrm/drmrightsstoringlocation/group"/>
+ </component>
+ <component id="commondrm_build" filter="s60" name="Common DRM Build">
+ <!-- should be split into the above files, or them collapsed into a single component -->
+ <unit bldFile="commondrm/group"/>
+ </component>
+ <component id="commondrm_qt_build" filter="s60" name="Common DRM Qt Build" introduced="^4">
+ <!-- split up build components -->
+ <unit bldFile="commondrm" qt:proFile="commondrm.pro"/>
+ </component>
+ </collection>
+ <collection id="omadrm" name="OMA DRM" level="server">
+ <!-- split up build components -->
+ <component id="omadrm_build" filter="s60" name="OMA DRM Build">
+ <unit bldFile="omadrm/group"/>
+ </component>
+ <component id="omadrm_qt_build" filter="s60" name="OMA DRM Qt Build" introduced="^4">
+ <unit bldFile="omadrm" qt:proFile="omadrm.pro"/>
+ </component>
+ <component id="foundationcerts" filter="sf_build" name="Foundation Certificates">
+ <unit bldFile="omadrm/foundationcerts/group"/>
+ </component>
+ </collection>
+ <collection id="wmdrm" name="Windows Media DRM" level="framework">
+ <!-- collection is really a component. Move down a directory -->
+ <component id="wmdrm_build" filter="s60" name="WM DRM Build">
+ <unit bldFile="wmdrm/group"/>
+ </component>
+ </collection>
+ <collection id="drm_info" name="DRM Info" level="specific">
+ <component id="drm_api_test" filter="s60,test,api_test" name="DRM Build" purpose="development">
+ <unit bldFile="tsrc/group"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
+
--- /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 @@
+<PackageMap root="sf" layer="mw"/>
--- 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 <aknViewAppUi.h>
#include <coeaui.h>
#include <coecntrl.h>
-#include <InternetConnectionManager.h>
#include <wmdrmdlaapp.rsg>
#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;
}
// ---------------------------------------------------------------------------