diff -r ba8a586c45f1 -r c20154ccf3c0 filebrowser/engine/FBFileUtils.h
--- a/filebrowser/engine/FBFileUtils.h	Fri Jun 11 16:29:34 2010 +0100
+++ b/filebrowser/engine/FBFileUtils.h	Thu Jul 22 16:33:59 2010 +0100
@@ -24,10 +24,9 @@
 #include <w32std.h>
 #include <badesca.h>
 #include <coedef.h>
-#include <AknServerApp.h>
 #include <msvapi.h>
-#include <AknProgressDialog.h>
 #include <tz.h>
+#include "FB.hrh"
 
 _LIT(KIRAppPath, "z:\\sys\\bin\\irapp.exe");
 _LIT(KBTAppPath, "z:\\sys\\bin\\btui.exe");
@@ -39,16 +38,10 @@
 // FORWARD DECLARATIONS
 class CEngine;
 class CFileBrowserFileOps;
-class CAknIconArray;
-class TAknsItemID;
 class CDocumentHandler;
-//class CAknWaitDialog;
-//class CAknProgressDialog;
 class CEikProgressInfo;
 class CFBFileOpClient;
-//class CAknProgressDialog;
 class CEikProgressInfo;
-class CAknOpenFileService;
 class CMessageDigest;
 
 // CLASS DECLARATIONS
@@ -181,7 +174,7 @@
 
 
 
-class CFileBrowserFileUtils : public CActive, public MAknServerAppExitObserver, public MMsvSessionObserver, public MProgressDialogCallback 
+class CFileBrowserFileUtils : public CActive, public MMsvSessionObserver
 	{
 private:
     enum TState // active object states
@@ -195,17 +188,6 @@
     	EClipBoardModeCopy
     	};
 
-    enum TListingMode
-    	{
-    	ENormalEntries = 0,
-    	ESearchResults,
-    	EOpenFiles,
-    	EMsgAttachmentsInbox,
-    	EMsgAttachmentsDrafts,
-    	EMsgAttachmentsSentItems,
-    	EMsgAttachmentsOutbox
-    	};
-    	    	
 public:
 	static CFileBrowserFileUtils* NewL(CEngine* aEngine);
 	~CFileBrowserFileUtils();
@@ -216,17 +198,14 @@
 
 private: // from CActive
 	void RunL();
-    TInt RunError(TInt aError);
+        TInt RunError(TInt aError);
 	void DoCancel();
 
-private: // from MAknServerAppExitObserver
-    void HandleServerAppExit(TInt aReason);
-
 private: // from MMsvSessionObserver
     void HandleSessionEventL(TMsvSessionEvent aEvent, TAny* aArg1, TAny* aArg2, TAny* aArg3);
 
-private:  //from MProgressDialogCallback
-    void DialogDismissedL(TInt aButtonId);  
+public:  //from MProgressDialogCallback
+    void DialogDismissedL(/*TInt aButtonId*/);
     
 public: // command handling
     void StartExecutingCommandsL(const TDesC& aLabel);
@@ -334,7 +313,7 @@
     void GetDriveVolumeLabel(TInt aIndex, TFileName &aVolumeLabel);
 
     CFileEntryList* FileEntries() const;
-    CDriveEntryList* DriveEntries() const;   
+    CDriveEntryList* DriveEntries() const;
     
 public:    
     inline TInt SortMode() { return iSortMode; }
@@ -343,19 +322,23 @@
     inline CFileEntryList* CurrentSelectionList() { return iCurrentSelectionList; }
     inline TBool IsDriveListViewActive() { return iCurrentPath==KNullDesC && iListingMode==ENormalEntries; }
     inline TBool IsNormalModeActive() { return iListingMode==ENormalEntries; }
+    inline TListingMode ListingMode() { return iListingMode; }
     inline TFileName CurrentPath() { return iCurrentPath; }
 	
     inline TSearchAttributes GetSearchAttributes(){ return iSearchAttributes; };
     inline void ChangeAttributes(TSearchAttributes attributes) { iSearchAttributes = attributes; };
     inline TSearchResults SearchResults(){ return iFileSearchResults; };
-    inline CFileEntryList* FoundFiles() { return iFileEntryList; };
+    inline CFileEntryList* FoundFiles() { return iFileEntryList; };    
+    inline void SetAllowProcessing(TBool aAllowProcessing) { iAllowProcessing = aAllowProcessing; }
 	
 private:
     TState                          iState;
     CEngine*                        iEngine;
     CFileBrowserFileOps*            iFileOps;
-//    CAknWaitDialog*                 iWaitDialog;
-//    CAknProgressDialog*             iProgressDialog;
+
+    TBool                           isWaitDialog;
+    TBool                           isProgressDialog;
+
     CEikProgressInfo*               iProgressInfo;
     CCommandArray*                  iCommandArray;
     TInt                            iCurrentEntry;
@@ -381,13 +364,14 @@
     CFileEntryList*                 iCurrentSelectionList;
     TSearchAttributes               iSearchAttributes;
     CDocumentHandler*               iDocHandler;
-    CAknOpenFileService*            iOpenFileService;
+
     RFile                           iMsgStoreWalkFile;
     TInt                            iPrevFolderIndex;
     TFileName                       iPrevFolderName;
     RTz                             iTz;
     TSearchResults                  iFileSearchResults;
     CDesCArray*                     iTextArray;
+    TBool                           iAllowProcessing;
     };