browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClntSubSession.cpp
branchRCL_3
changeset 94 919f36ff910f
parent 93 79859ed3eea9
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClntSubSession.cpp	Tue Aug 31 16:17:46 2010 +0300
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClntSubSession.cpp	Wed Sep 01 12:28:30 2010 +0100
@@ -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
-        TBool   iRemovableDest;
+        TInt32   iDestMemType;
 
         //  EDlAttrState THttpDownloadState
          TInt32 iDlState;
@@ -400,7 +400,7 @@
                   
        case EDlAttrDestRemovable:
             {
-       	     iRemovableDest = aValue;
+       	     iDestMemType = (aValue) ? KDriveAttRemovable : KDriveAttLocal;
             }
             
         default:
@@ -473,6 +473,11 @@
             }
             break;
             
+        case EDlAttrDestRemovable:
+            {
+            iDestMemType = aValue;
+            }
+            
         default:
             break;
         }
@@ -667,7 +672,7 @@
                   
 		case EDlAttrDestRemovable:
             {
-       	    aValue = iRemovableDest ;
+       	    aValue = (KDriveAttRemovable == iDestMemType) ? ETrue : EFalse ;
             }
             break;    
         default:
@@ -726,7 +731,7 @@
    
         case EDlAttrDestRemovable:
             {
-            aValue = mediaData->DesRemovable();
+            aValue = ( KDriveAttRemovable == mediaData->DesRemovable()) ? ETrue : EFalse ;
             }
             break;
                 
@@ -805,6 +810,12 @@
             }
             break;
             
+        case EDlAttrDestRemovable:
+            {
+            aValue = iDestMemType ;
+            }
+            break;            
+            
         default:
             {
             ret = KErrNotFound;
@@ -883,6 +894,12 @@
             aValue = mediaData->Method();
             }
             break;
+            
+        case EDlAttrDestRemovable:
+            {
+            aValue = mediaData->DesRemovable();
+            }
+            break;
 
         default:
             {
@@ -1991,9 +2008,9 @@
     GetBoolAttribute(EDlAttrPausable, bPausable);
     iDlExtension->SetBoolAttribute( EDlAttrPausable, bPausable );
     
-    TBool bRemovableDest;
-    GetBoolAttribute(EDlAttrDestRemovable, bRemovableDest);
-    iDlExtension->SetBoolAttribute( EDlAttrDestRemovable, bRemovableDest );
+    TInt32 removableDestStatus;
+    GetIntAttribute(EDlAttrDestRemovable, removableDestStatus);
+    iDlExtension->SetIntAttribute( EDlAttrDestRemovable, removableDestStatus );
     
     //    
         
@@ -2720,7 +2737,7 @@
     		return KErrGeneral;
     		}
     		iDlExtension->SetBoolAttribute( aAttribute, aValue);
-    		return;
+    		return KErrNone;
     	}
     	
 	if (aAttribute == EDlAttrProgressive)