equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies). |
2 * Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). |
3 * All rights reserved. |
3 * All rights reserved. |
4 * This component and the accompanying materials are made available |
4 * This component and the accompanying materials are made available |
5 * under the terms of the License "Eclipse Public License v1.0" |
5 * under the terms of the License "Eclipse Public License v1.0" |
6 * which accompanies this distribution, and is available |
6 * which accompanies this distribution, and is available |
7 * at the URL "http://www.eclipse.org/legal/epl-v10.html". |
7 * at the URL "http://www.eclipse.org/legal/epl-v10.html". |
23 #include "sishelper.h" |
23 #include "sishelper.h" |
24 #include "log.h" |
24 #include "log.h" |
25 #include "installclientserver.h" |
25 #include "installclientserver.h" |
26 #include <swi/pkgremover.h> |
26 #include <swi/pkgremover.h> |
27 #include <connect/sbdefs.h> |
27 #include <connect/sbdefs.h> |
|
28 #include "cleanuputils.h" |
28 |
29 |
29 // Maximum buffer size |
30 // Maximum buffer size |
30 const TInt KMaxBufferSize = 1024; |
31 const TInt KMaxBufferSize = 1024; |
31 |
32 |
32 namespace Swi |
33 namespace Swi |
41 TInt FilterErrors(TInt aError); |
42 TInt FilterErrors(TInt aError); |
42 |
43 |
43 /*static*/ |
44 /*static*/ |
44 EXPORT_C void UninstalledSisPackages::ListL(TDriveNumber aDrive, RPointerArray<CUninstalledPackageEntry>& aPackageList) |
45 EXPORT_C void UninstalledSisPackages::ListL(TDriveNumber aDrive, RPointerArray<CUninstalledPackageEntry>& aPackageList) |
45 { |
46 { |
|
47 CleanupResetAndDestroyPushL(aPackageList); |
46 aPackageList.ResetAndDestroy(); |
48 aPackageList.ResetAndDestroy(); |
47 |
49 |
48 // Check if SWIS is busy |
50 // Check if SWIS is busy |
49 if (IsSWISBusy()) |
51 if (IsSWISBusy()) |
50 { |
52 { |
148 } |
150 } |
149 CleanupStack::PopAndDestroy(2, output); // readStream, output |
151 CleanupStack::PopAndDestroy(2, output); // readStream, output |
150 |
152 |
151 // Shutdown InstallServer and SisHelper |
153 // Shutdown InstallServer and SisHelper |
152 CleanupStack::PopAndDestroy(2, &server); |
154 CleanupStack::PopAndDestroy(2, &server); |
|
155 CleanupStack::Pop(&aPackageList); |
153 } |
156 } |
154 |
157 |
155 /*static*/ |
158 /*static*/ |
156 EXPORT_C void UninstalledSisPackages::RemoveL(const CUninstalledPackageEntry& aPackage) |
159 EXPORT_C void UninstalledSisPackages::RemoveL(const CUninstalledPackageEntry& aPackage) |
157 { |
160 { |