browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClntSubSession.cpp
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClntSubSession.cpp Thu Aug 19 10:58:56 2010 +0300
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClntSubSession.cpp Tue Aug 31 16:17:46 2010 +0300
@@ -19,7 +19,7 @@
// INCLUDE FILES
#include "DownloadMgrLogger.h"
-#include <downloadmgrclient.h>
+#include "DownloadMgrClient.h"
#include "DownloadMgrServer.h"
#include "DownloadMgrHandler.h"
#include "DownloadMgrStart.h"
@@ -31,11 +31,11 @@
#include <hash.h>
#include <e32svr.h>
-#include <coddownload.h>
+#include <CodDownload.h>
#include <AiwGenericParam.h>
#include <eikenv.h>
#include <httpfiltercommonstringsext.h>
-#include <EscapeUtils.h>
+#include <escapeutils.h>
// CONSTANTS
_LIT8( KTransactionCallback, "TransactionCallback" );
@@ -252,7 +252,7 @@
// EDlAttrPausable
TBool iPausable;
// EDlAttrDestRemovable
- TInt32 iDestMemType;
+ TBool iRemovableDest;
// EDlAttrState THttpDownloadState
TInt32 iDlState;
@@ -400,7 +400,7 @@
case EDlAttrDestRemovable:
{
- iDestMemType = (aValue) ? KDriveAttRemovable : KDriveAttLocal;
+ iRemovableDest = aValue;
}
default:
@@ -473,11 +473,6 @@
}
break;
- case EDlAttrDestRemovable:
- {
- iDestMemType = aValue;
- }
-
default:
break;
}
@@ -672,7 +667,7 @@
case EDlAttrDestRemovable:
{
- aValue = (KDriveAttRemovable == iDestMemType) ? ETrue : EFalse ;
+ aValue = iRemovableDest ;
}
break;
default:
@@ -731,7 +726,7 @@
case EDlAttrDestRemovable:
{
- aValue = ( KDriveAttRemovable == mediaData->DesRemovable()) ? ETrue : EFalse ;
+ aValue = mediaData->DesRemovable();
}
break;
@@ -810,12 +805,6 @@
}
break;
- case EDlAttrDestRemovable:
- {
- aValue = iDestMemType ;
- }
- break;
-
default:
{
ret = KErrNotFound;
@@ -894,12 +883,6 @@
aValue = mediaData->Method();
}
break;
-
- case EDlAttrDestRemovable:
- {
- aValue = mediaData->DesRemovable();
- }
- break;
default:
{
@@ -2008,9 +1991,9 @@
GetBoolAttribute(EDlAttrPausable, bPausable);
iDlExtension->SetBoolAttribute( EDlAttrPausable, bPausable );
- TInt32 removableDestStatus;
- GetIntAttribute(EDlAttrDestRemovable, removableDestStatus);
- iDlExtension->SetIntAttribute( EDlAttrDestRemovable, removableDestStatus );
+ TBool bRemovableDest;
+ GetBoolAttribute(EDlAttrDestRemovable, bRemovableDest);
+ iDlExtension->SetBoolAttribute( EDlAttrDestRemovable, bRemovableDest );
//
@@ -2737,7 +2720,7 @@
return KErrGeneral;
}
iDlExtension->SetBoolAttribute( aAttribute, aValue);
- return KErrNone;
+ return;
}
if (aAttribute == EDlAttrProgressive)