# HG changeset patch
# User Sampo Huttunen <sampo.huttunen@nokia.com>
# Date 1290584386 -7200
# Node ID a6c41ca11adf78ccbc8962b5a9491047fb55650c
# Parent  97caed2372caf77e7fce97f813bce904cab554ff
Updated the SIS package, there was some BC issue with the earlier version. Also updated the platform UID to S^3 version.

diff -r 97caed2372ca -r a6c41ca11adf install/dlnasrv.sis
Binary file install/dlnasrv.sis has changed
diff -r 97caed2372ca -r a6c41ca11adf install/pkg/dlnasrv.pkg
--- a/install/pkg/dlnasrv.pkg	Thu Nov 18 15:46:57 2010 +0200
+++ b/install/pkg/dlnasrv.pkg	Wed Nov 24 09:39:46 2010 +0200
@@ -18,7 +18,7 @@
 &EN
 
 ; Standard SIS file header
-#{"DLNA Services"},(0x2000F8DB),1,1,0, TYPE=SA, RU
+#{"DLNA Services"},(0x2000F8DB),1,1,2, TYPE=SA, RU
 
 ; Localized Vendor name
 %{"Nokia"}
@@ -26,8 +26,8 @@
 ; Unique Vendor name
 :"Nokia"
 
-; Supports Series 60 v 3.0
-[0x101F7961], 0, 0, 0, {"S60ProductID"}
+; Supports S^3
+[0x20022E6D], 0, 0, 0, {"S60ProductID"}
 
 ; ---------------------------------------------------------------------------
 ; upnpavcontroller
diff -r 97caed2372ca -r a6c41ca11adf install/pkg/dlnasrv_cenrep_keys.pkg
--- a/install/pkg/dlnasrv_cenrep_keys.pkg	Thu Nov 18 15:46:57 2010 +0200
+++ b/install/pkg/dlnasrv_cenrep_keys.pkg	Wed Nov 24 09:39:46 2010 +0200
@@ -18,10 +18,10 @@
 &EN
 
 ; Standard SIS file header
-#{"DLNA Services cenrep keys"}, (0x10202BE9), 1, 1, 0, TYPE=SP
+#{"DLNA Services cenrep keys"}, (0x10202BE9), 1, 1, 2, TYPE=SP
 
-; Supports Series 60 v3.0
-[0x101F7961], 0, 0, 0, {"S60ProductID"}
+; Supports S^3
+[0x20022E6D], 0, 0, 0, {"S60ProductID"}
 
 ; Localised vendor name
 %{"Nokia-EN"}
diff -r 97caed2372ca -r a6c41ca11adf install/pkg/dlnasrv_udeb.pkg
--- a/install/pkg/dlnasrv_udeb.pkg	Thu Nov 18 15:46:57 2010 +0200
+++ b/install/pkg/dlnasrv_udeb.pkg	Wed Nov 24 09:39:46 2010 +0200
@@ -18,8 +18,7 @@
 &EN
 
 ; Standard SIS file header
-;#{"DLNA Services"},(0x2000F8DB),1,1,0, TYPE=SA, RU
-#{"DLNA Services"},(0xEFFFFFFF),1,1,0, TYPE=SA, RU 
+#{"DLNA Services"},(0x2000F8DB),1,1,2, TYPE=SA, RU 
 
 ; Localized Vendor name
 %{"Nokia"}
@@ -27,8 +26,8 @@
 ; Unique Vendor name
 :"Nokia"
 
-; Supports Series 60 v 3.0
-[0x101F7961], 0, 0, 0, {"S60ProductID"}
+; Supports S^3
+[0x20022E6D], 0, 0, 0, {"S60ProductID"}
 
 ; ---------------------------------------------------------------------------
 ; upnpavcontroller
diff -r 97caed2372ca -r a6c41ca11adf upnpsettings/upnpsettingsengine/bwins/upnpsettingsengineu.def
--- a/upnpsettings/upnpsettingsengine/bwins/upnpsettingsengineu.def	Thu Nov 18 15:46:57 2010 +0200
+++ b/upnpsettings/upnpsettingsengine/bwins/upnpsettingsengineu.def	Wed Nov 24 09:39:46 2010 +0200
@@ -1,6 +1,6 @@
 EXPORTS
 	??1CUPnPSettingsEngine@@UAE@XZ @ 1 NONAME ; CUPnPSettingsEngine::~CUPnPSettingsEngine(void)
-	?CreateAccessPointL@CUPnPSettingsEngine@@SAXXZ @ 2 NONAME ; void CUPnPSettingsEngine::CreateAccessPointL(void)
+	?CreateAccessPointL@CUPnPSettingsEngine@@SAXXZ @ 2 NONAME ABSENT; void CUPnPSettingsEngine::CreateAccessPointL(void)
 	?GetAccessPoint@CUPnPSettingsEngine@@QAEHAAH@Z @ 3 NONAME ; int CUPnPSettingsEngine::GetAccessPoint(int &)
 	?GetAccessPointSetting@CUPnPSettingsEngine@@QAEHAAH@Z @ 4 NONAME ; int CUPnPSettingsEngine::GetAccessPointSetting(int &)
 	?GetCopyLocationDriveL@CUPnPSettingsEngine@@QBEXAAW4TDriveNumber@@@Z @ 5 NONAME ; void CUPnPSettingsEngine::GetCopyLocationDriveL(enum TDriveNumber &) const
diff -r 97caed2372ca -r a6c41ca11adf upnpsettings/upnpsettingsengine/eabi/upnpsettingsengineu.def
--- a/upnpsettings/upnpsettingsengine/eabi/upnpsettingsengineu.def	Thu Nov 18 15:46:57 2010 +0200
+++ b/upnpsettings/upnpsettingsengine/eabi/upnpsettingsengineu.def	Wed Nov 24 09:39:46 2010 +0200
@@ -3,7 +3,7 @@
 	_ZN19CUPnPSettingsEngine13SetFirstStartEi @ 2 NONAME
 	_ZN19CUPnPSettingsEngine14GetAccessPointERi @ 3 NONAME
 	_ZN19CUPnPSettingsEngine14SetAccessPointEi @ 4 NONAME
-	_ZN19CUPnPSettingsEngine18CreateAccessPointLEv @ 5 NONAME
+	_ZN19CUPnPSettingsEngine18CreateAccessPointLEv @ 5 NONAME ABSENT
 	_ZN19CUPnPSettingsEngine18GetCurrentIapNameLEi @ 6 NONAME
 	_ZN19CUPnPSettingsEngine19IsAccessPointValidLEi @ 7 NONAME
 	_ZN19CUPnPSettingsEngine20GetWLANAccessPointsLEP12CDesC16ArrayR6RArrayIxE @ 8 NONAME
diff -r 97caed2372ca -r a6c41ca11adf upnpsettings/upnpsettingsengine/inc/upnpsettingsengine.h
--- a/upnpsettings/upnpsettingsengine/inc/upnpsettingsengine.h	Thu Nov 18 15:46:57 2010 +0200
+++ b/upnpsettings/upnpsettingsengine/inc/upnpsettingsengine.h	Wed Nov 24 09:39:46 2010 +0200
@@ -215,15 +215,6 @@
     IMPORT_C static void GetWLANAccessPointsL( CDesCArray* aNameArray,
                                                RArray<TInt64>& aIapIdArr );
     
-    /**
-     * Static helper method to create the iap editing window
-     * arrays.
-     * 
-     * @since S60 5.1
-     * @param none
-     */        
-    IMPORT_C static void CreateAccessPointL();
-    
 private:
 
     /**
diff -r 97caed2372ca -r a6c41ca11adf upnpsettings/upnpsettingsengine/src/upnpsettingsengine.cpp
--- a/upnpsettings/upnpsettingsengine/src/upnpsettingsengine.cpp	Thu Nov 18 15:46:57 2010 +0200
+++ b/upnpsettings/upnpsettingsengine/src/upnpsettingsengine.cpp	Wed Nov 24 09:39:46 2010 +0200
@@ -682,20 +682,6 @@
 
     }
 
-
-// --------------------------------------------------------------------------
-// CUPnPSettingsEngine::CreateAccessPointL
-// Create AP modifying window
-// --------------------------------------------------------------------------
-//
-EXPORT_C void CUPnPSettingsEngine::CreateAccessPointL()
-    {
-    CCmSettingsUi* settings = CCmSettingsUi::NewL();    
-    CleanupStack::PushL( settings );
-    settings->RunSettingsL();
-    CleanupStack::PopAndDestroy( settings );
-    }
-    
 //---------------------------------------------------------------------------
 // CUPnPSettingsEngine::IsWLANAccessPointValidL
 // Checks if the given access point is valid.