equal
deleted
inserted
replaced
107 User::LeaveIfError( iFs.DriveToChar( driveNumber, |
107 User::LeaveIfError( iFs.DriveToChar( driveNumber, |
108 currentDriveLetter ) ); |
108 currentDriveLetter ) ); |
109 ScanOnDriveL( currentDriveLetter ); |
109 ScanOnDriveL( currentDriveLetter ); |
110 } |
110 } |
111 } |
111 } |
112 |
|
113 |
|
114 return iWidgets; |
112 return iWidgets; |
115 } |
113 } |
116 |
114 |
117 // ---------------------------------------------------------------------------- |
115 // ---------------------------------------------------------------------------- |
118 // |
116 // |
202 CleanupStack::Pop( clone ); |
200 CleanupStack::Pop( clone ); |
203 } |
201 } |
204 } |
202 } |
205 else |
203 else |
206 { |
204 { |
207 TRAP_IGNORE( ParseManifestFileL( manifestFilePathName, aDirectoryName, |
205 TRAP_IGNORE( ParseManifestFileL( |
208 aDrive ) ); |
206 manifestFilePathName, aDirectoryName, aDrive ) ); |
209 } |
207 } |
210 CleanupStack::PopAndDestroy( &manifestFilePathName ); |
208 CleanupStack::PopAndDestroy( &manifestFilePathName ); |
211 } |
209 } |
212 } |
210 } |
213 CleanupStack::PopAndDestroy( fileList ); |
211 CleanupStack::PopAndDestroy( fileList ); |
295 ParseTranslationFileNameL( element, widgetDescriptor ); |
293 ParseTranslationFileNameL( element, widgetDescriptor ); |
296 } |
294 } |
297 } |
295 } |
298 CleanupStack::PopAndDestroy( &childElementList ); |
296 CleanupStack::PopAndDestroy( &childElementList ); |
299 |
297 |
300 //set path for hs to use, trim last 2 chars (doubleslash) |
298 // Set path for hs to use, trim the last character (backslash). |
301 HBufC *libraryPath = GetManifestDirectoryPathLC( aPackageUid, aDrive ); |
299 HBufC *libraryPath = GetManifestDirectoryPathLC( aPackageUid, aDrive ); |
302 widgetDescriptor->SetPathL(libraryPath->Mid(0,libraryPath->Length()-1)); |
300 widgetDescriptor->SetPathL(libraryPath->Mid(0,libraryPath->Length()-1)); |
303 CleanupStack::PopAndDestroy(libraryPath); |
301 CleanupStack::PopAndDestroy(libraryPath); |
304 |
302 |
305 |
303 |
771 CleanupStack::PushL( result ); |
769 CleanupStack::PushL( result ); |
772 |
770 |
773 return result; |
771 return result; |
774 } |
772 } |
775 |
773 |
776 |
|
777 // End of File |
774 // End of File |