equal
deleted
inserted
replaced
153 |
153 |
154 delete iResults; |
154 delete iResults; |
155 iResults = NULL; |
155 iResults = NULL; |
156 iResults = Usif::COpaqueNamedParams::NewL(); |
156 iResults = Usif::COpaqueNamedParams::NewL(); |
157 |
157 |
|
158 RArray<TInt> driveArray; |
|
159 CleanupClosePushL( driveArray ); |
|
160 RArray<TInt> languageArray; |
|
161 CleanupClosePushL( languageArray ); |
|
162 |
158 if( aSilent ) |
163 if( aSilent ) |
159 { |
164 { |
160 iArguments->AddIntL( Usif::KSifInParam_InstallSilently, ETrue ); |
165 iArguments->AddIntL( Usif::KSifInParam_InstallSilently, ETrue ); |
|
166 |
|
167 driveArray.AppendL( EDriveE ); |
|
168 driveArray.AppendL( EDriveC ); |
|
169 iArguments->AddIntArrayL( Usif::KSifInParam_Drive, driveArray ); |
|
170 |
|
171 languageArray.AppendL( ELangFinnish ); |
|
172 languageArray.AppendL( ELangSwedish ); |
|
173 languageArray.AppendL( ELangEnglish ); |
|
174 iArguments->AddIntArrayL( Usif::KSifInParam_Languages, languageArray ); |
161 } |
175 } |
162 if( aOcsp ) |
176 if( aOcsp ) |
163 { |
177 { |
164 iArguments->AddIntL( Usif::KSifInParam_PerformOCSP, Usif::EAllowed ); |
178 iArguments->AddIntL( Usif::KSifInParam_PerformOCSP, Usif::EAllowed ); |
165 iArguments->AddStringL( Usif::KSifInParam_OCSPUrl, KDefaultOcspResponderUrl ); |
179 iArguments->AddStringL( Usif::KSifInParam_OCSPUrl, KDefaultOcspResponderUrl ); |
171 } |
185 } |
172 else |
186 else |
173 { |
187 { |
174 iSoftwareInstall.Install( fileName, *iArguments, *iResults, iStatus ); |
188 iSoftwareInstall.Install( fileName, *iArguments, *iResults, iStatus ); |
175 } |
189 } |
|
190 |
|
191 CleanupStack::PopAndDestroy( &languageArray ); |
|
192 CleanupStack::PopAndDestroy( &driveArray ); |
176 } |
193 } |
177 else |
194 else |
178 { |
195 { |
179 if( aSilent ) |
196 if( aSilent ) |
180 { |
197 { |