--- a/ncdengine/provider/client/src/ncdsilentinstalloperationproxy.cpp	Tue Aug 31 15:21:33 2010 +0300
+++ b/ncdengine/provider/client/src/ncdsilentinstalloperationproxy.cpp	Wed Sep 01 12:22:02 2010 +0100
@@ -39,7 +39,7 @@
     CNcdNodeManagerProxy* aNodeManager,
     MNcdInstallOperationObserver* aObserver,
     MNcdInstallationService& aInstallationService,
-    Usif::COpaqueNamedParams* aInstallOptions )
+    const SwiUI::TInstallOptions& aInstallOptions )
     {
     CNcdSilentInstallOperationProxy* self =
         new( ELeave ) CNcdSilentInstallOperationProxy( aInstallationService, 
@@ -59,14 +59,15 @@
 //
 CNcdSilentInstallOperationProxy::CNcdSilentInstallOperationProxy( 
     MNcdInstallationService& aInstallationService,
-    /*const*/ Usif::COpaqueNamedParams* aInstallOptions )
+    const SwiUI::TInstallOptions& aInstallOptions )
 : CNcdInstallOperationProxy( aInstallationService )
     {
     // Copy all the install options into the buffer that will be used
     // when silent installation is delegated to the installer.
-    iInstallOptions = aInstallOptions;
+    iInstallOptionsPackage = aInstallOptions;
     }
 
+
 // ---------------------------------------------------------------------------
 // Destructor
 // ---------------------------------------------------------------------------
@@ -74,9 +75,6 @@
 CNcdSilentInstallOperationProxy::~CNcdSilentInstallOperationProxy()
     {
     DLTRACEIN(( "" ));
-    
-    delete iInstallOptions;
-    
     // Cancel must be called here because base class will only call its own
     // DoCancel()
     Cancel();
@@ -192,7 +190,7 @@
                 iFileHandle, 
                 aFile.MimeType(), 
                 aFile.Purpose(), 
-                SilentInstallOptions() ); 
+                SilentInstallOptionsPackage() );
             break;
             }
         
@@ -203,7 +201,7 @@
                 iFileHandle, 
                 aFile.MimeType(), 
                 aFile.Data(),
-                SilentInstallOptions() );             
+                SilentInstallOptionsPackage() );             
             break;
             }            
 
@@ -214,7 +212,7 @@
             {
             Installer().SilentInstallWidgetL(
                     iFileHandle, 
-                    SilentInstallOptions() );
+                    SilentInstallOptionsPackage() );
    
             break;
             }
@@ -229,8 +227,9 @@
     DLTRACEOUT((""));   
     }
 
-const Usif::COpaqueNamedParams* CNcdSilentInstallOperationProxy::SilentInstallOptions() const
+
+const SwiUI::TInstallOptionsPckg& CNcdSilentInstallOperationProxy::SilentInstallOptionsPackage() const
     {
     DLTRACEIN((""));
-    return iInstallOptions;
+    return iInstallOptionsPackage;
     }