37 MNcdOperationProxyRemoveHandler* aRemoveHandler, |
37 MNcdOperationProxyRemoveHandler* aRemoveHandler, |
38 CNcdNodeProxy* aNode, |
38 CNcdNodeProxy* aNode, |
39 CNcdNodeManagerProxy* aNodeManager, |
39 CNcdNodeManagerProxy* aNodeManager, |
40 MNcdInstallOperationObserver* aObserver, |
40 MNcdInstallOperationObserver* aObserver, |
41 MNcdInstallationService& aInstallationService, |
41 MNcdInstallationService& aInstallationService, |
42 Usif::COpaqueNamedParams* aInstallOptions ) |
42 const SwiUI::TInstallOptions& aInstallOptions ) |
43 { |
43 { |
44 CNcdSilentInstallOperationProxy* self = |
44 CNcdSilentInstallOperationProxy* self = |
45 new( ELeave ) CNcdSilentInstallOperationProxy( aInstallationService, |
45 new( ELeave ) CNcdSilentInstallOperationProxy( aInstallationService, |
46 aInstallOptions ); |
46 aInstallOptions ); |
47 |
47 |
57 // Constructor |
57 // Constructor |
58 // --------------------------------------------------------------------------- |
58 // --------------------------------------------------------------------------- |
59 // |
59 // |
60 CNcdSilentInstallOperationProxy::CNcdSilentInstallOperationProxy( |
60 CNcdSilentInstallOperationProxy::CNcdSilentInstallOperationProxy( |
61 MNcdInstallationService& aInstallationService, |
61 MNcdInstallationService& aInstallationService, |
62 /*const*/ Usif::COpaqueNamedParams* aInstallOptions ) |
62 const SwiUI::TInstallOptions& aInstallOptions ) |
63 : CNcdInstallOperationProxy( aInstallationService ) |
63 : CNcdInstallOperationProxy( aInstallationService ) |
64 { |
64 { |
65 // Copy all the install options into the buffer that will be used |
65 // Copy all the install options into the buffer that will be used |
66 // when silent installation is delegated to the installer. |
66 // when silent installation is delegated to the installer. |
67 iInstallOptions = aInstallOptions; |
67 iInstallOptionsPackage = aInstallOptions; |
68 } |
68 } |
|
69 |
69 |
70 |
70 // --------------------------------------------------------------------------- |
71 // --------------------------------------------------------------------------- |
71 // Destructor |
72 // Destructor |
72 // --------------------------------------------------------------------------- |
73 // --------------------------------------------------------------------------- |
73 // |
74 // |
74 CNcdSilentInstallOperationProxy::~CNcdSilentInstallOperationProxy() |
75 CNcdSilentInstallOperationProxy::~CNcdSilentInstallOperationProxy() |
75 { |
76 { |
76 DLTRACEIN(( "" )); |
77 DLTRACEIN(( "" )); |
77 |
|
78 delete iInstallOptions; |
|
79 |
|
80 // Cancel must be called here because base class will only call its own |
78 // Cancel must be called here because base class will only call its own |
81 // DoCancel() |
79 // DoCancel() |
82 Cancel(); |
80 Cancel(); |
83 DLTRACEOUT(( "" )); |
81 DLTRACEOUT(( "" )); |
84 } |
82 } |
190 { |
188 { |
191 Installer().SilentInstallL( |
189 Installer().SilentInstallL( |
192 iFileHandle, |
190 iFileHandle, |
193 aFile.MimeType(), |
191 aFile.MimeType(), |
194 aFile.Purpose(), |
192 aFile.Purpose(), |
195 SilentInstallOptions() ); |
193 SilentInstallOptionsPackage() ); |
196 break; |
194 break; |
197 } |
195 } |
198 |
196 |
199 case CNcdInstallInfo::ENcdInstallJar: // flow through |
197 case CNcdInstallInfo::ENcdInstallJar: // flow through |
200 case CNcdInstallInfo::ENcdInstallJad: |
198 case CNcdInstallInfo::ENcdInstallJad: |
201 { |
199 { |
202 Installer().SilentInstallJavaL( |
200 Installer().SilentInstallJavaL( |
203 iFileHandle, |
201 iFileHandle, |
204 aFile.MimeType(), |
202 aFile.MimeType(), |
205 aFile.Data(), |
203 aFile.Data(), |
206 SilentInstallOptions() ); |
204 SilentInstallOptionsPackage() ); |
207 break; |
205 break; |
208 } |
206 } |
209 |
207 |
210 // Call the corresponding installing function according to the type value. |
208 // Call the corresponding installing function according to the type value. |
211 // MimeType info is missing here but SWI will figure out the mimetype via file handler |
209 // MimeType info is missing here but SWI will figure out the mimetype via file handler |
212 // and call the corresponding plugin. |
210 // and call the corresponding plugin. |
213 case CNcdInstallInfo::ENcdInstallWidget: |
211 case CNcdInstallInfo::ENcdInstallWidget: |
214 { |
212 { |
215 Installer().SilentInstallWidgetL( |
213 Installer().SilentInstallWidgetL( |
216 iFileHandle, |
214 iFileHandle, |
217 SilentInstallOptions() ); |
215 SilentInstallOptionsPackage() ); |
218 |
216 |
219 break; |
217 break; |
220 } |
218 } |
221 |
219 |
222 default: |
220 default: |