# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1265062815 -7200
# Node ID aba6b8104af318fad5e7aa6e4d09eb7c837400d2
# Parent  3eebb1e54d3a78117ef090fa5b44e69226e179a6
Revision: 201003
Kit: 201005

diff -r 3eebb1e54d3a -r aba6b8104af3 appinstall_plat/sw_installer_launcher_api/inc/SWInstApi.h
--- a/appinstall_plat/sw_installer_launcher_api/inc/SWInstApi.h	Tue Jan 26 12:06:03 2010 +0200
+++ b/appinstall_plat/sw_installer_launcher_api/inc/SWInstApi.h	Tue Feb 02 00:20:15 2010 +0200
@@ -21,7 +21,7 @@
 #define SWINSTAPI_H
 
 // INCLUDES
-#include <aknserverapp.h>
+#include <AknServerApp.h>
 #include <SWInstDefs.h>
 
 // FORWARD DECLARATIONS
diff -r 3eebb1e54d3a -r aba6b8104af3 appinstaller/AppMngr2/GSSettingsPlugin/src/appmngr2gssettingsplugin.cpp
--- a/appinstaller/AppMngr2/GSSettingsPlugin/src/appmngr2gssettingsplugin.cpp	Tue Jan 26 12:06:03 2010 +0200
+++ b/appinstaller/AppMngr2/GSSettingsPlugin/src/appmngr2gssettingsplugin.cpp	Tue Feb 02 00:20:15 2010 +0200
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -364,17 +364,11 @@
 
         if( aSettingIndex == EAppMngr2SettingSwInstall )
             {
-            // Install software
-            itemArray = iCoeEnv->ReadDesC16ArrayResourceL(
-                    R_APPMNGR2_ALLOW_UNTRUSTED_VALUE_ARRAY );
-            repDB->Get( KSWInstallerAllowUntrusted, newIndex );
-            if( newIndex )
-                {
-                newIndex = 1;
-                }
-            dlg = new ( ELeave ) CAknRadioButtonSettingPage(
-                    R_APPMNGR2_SET_PAGE_ALLOW_UNTRUSTED,
-                    newIndex, itemArray );
+            // Install software - toggle 'Signed only' and 'All'
+            TBool allowUntrusted = EFalse;
+            repDB->Get( KSWInstallerAllowUntrusted, allowUntrusted );
+            allowUntrusted = !allowUntrusted;
+            SetPermissionL( aSettingIndex, allowUntrusted, urlText );
             }
         else
             {
@@ -389,7 +383,7 @@
         CleanupStack::PopAndDestroy( repDB );
         CleanupStack::PushL( itemArray );
 
-        if( dlg->ExecuteLD( CAknSettingPage::EUpdateWhenChanged ) )
+        if( dlg && dlg->ExecuteLD( CAknSettingPage::EUpdateWhenChanged ) )
             {
             SetPermissionL( aSettingIndex, newIndex, urlText );
             }
diff -r 3eebb1e54d3a -r aba6b8104af3 iaupdate/IAD/backgroundchecker/src/iaupdatebgmain.cpp
--- a/iaupdate/IAD/backgroundchecker/src/iaupdatebgmain.cpp	Tue Jan 26 12:06:03 2010 +0200
+++ b/iaupdate/IAD/backgroundchecker/src/iaupdatebgmain.cpp	Tue Feb 02 00:20:15 2010 +0200
@@ -18,7 +18,7 @@
 
 
 // INCLUDE FILES 
-#include <FeatureControl.h>
+#include <featurecontrol.h>
 #include "iaupdatebgrefreshtimer.h"
 #include "iaupdatebgcontrollerfile.h"
 #include "iaupdatebgsoftnotification.h"
diff -r 3eebb1e54d3a -r aba6b8104af3 iaupdate/IAD/backgroundchecker/src/iaupdatebgrefreshtimer.cpp
--- a/iaupdate/IAD/backgroundchecker/src/iaupdatebgrefreshtimer.cpp	Tue Jan 26 12:06:03 2010 +0200
+++ b/iaupdate/IAD/backgroundchecker/src/iaupdatebgrefreshtimer.cpp	Tue Feb 02 00:20:15 2010 +0200
@@ -21,18 +21,18 @@
 #include <iaupdate.h>
 #include <iaupdateparameters.h>
 #include <iaupdateresult.h>
-#include <W32STD.H>
-#include <APGWGNAM.H>
+#include <w32std.h>
+#include <apgwgnam.h>
 #include <apgcli.h>
-#include <APACMDLN.H>
+#include <apacmdln.h>
 #include <avkon.hrh>
-#include <stringloader.h> 
+#include <StringLoader.h> 
 #include <iaupdate.rsg>
 #include <data_caging_path_literals.hrh>
 #include <bautils.h>
 #include <apgtask.h>
 #include <sysversioninfo.h>  //sysversioninfo
-#include <FeatureControl.h>
+#include <featurecontrol.h>
 
 #include "iaupdateprivatecrkeys.h"
 #include "iaupdate.hrh"
diff -r 3eebb1e54d3a -r aba6b8104af3 iaupdate/IAD/configurator/src/iadctrldcmoadapter.cpp
--- a/iaupdate/IAD/configurator/src/iadctrldcmoadapter.cpp	Tue Jan 26 12:06:03 2010 +0200
+++ b/iaupdate/IAD/configurator/src/iadctrldcmoadapter.cpp	Tue Feb 02 00:20:15 2010 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <featmgr.h>
-#include <FeatureControl.h>
+#include <featurecontrol.h>
 #include <iadctrl.rsg>
 #include <stringresourcereader.h> 
 #include <f32file.h> 
diff -r 3eebb1e54d3a -r aba6b8104af3 iaupdate/IAD/configurator/src/iadctrldcmoadapterproxy.cpp
--- a/iaupdate/IAD/configurator/src/iadctrldcmoadapterproxy.cpp	Tue Jan 26 12:06:03 2010 +0200
+++ b/iaupdate/IAD/configurator/src/iadctrldcmoadapterproxy.cpp	Tue Feb 02 00:20:15 2010 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <e32std.h>
-#include <ImplementationProxy.h>
+#include <implementationproxy.h>
 
 #include "iadctrldcmoadapter.h"
 
diff -r 3eebb1e54d3a -r aba6b8104af3 ncdengine/provider/server/src/ncdnodemanager.cpp
--- a/ncdengine/provider/server/src/ncdnodemanager.cpp	Tue Jan 26 12:06:03 2010 +0200
+++ b/ncdengine/provider/server/src/ncdnodemanager.cpp	Tue Feb 02 00:20:15 2010 +0200
@@ -2694,6 +2694,10 @@
         }
 
     DASSERT( node );
+    if (!node )
+        {
+        User::Leave( KErrGeneral );
+        }
             
     // Because this is temporary node, we will create or get the metadata for the node.
     // This way the metadata will be at least initialized with the purchase history data.