--- a/core/src/commands.h	Tue Sep 14 09:49:39 2010 +0100
+++ b/core/src/commands.h	Wed Sep 15 18:07:34 2010 +0100
@@ -962,32 +962,40 @@
 	TFileName2 iFileName;
 	};
 
-class CCmdDialog : public CCommandBase
+class CCmdDialog : public CCommandBase, public MCommandExtensionsV2
 	{
 public:
 	static CCommandBase* NewLC();
 	~CCmdDialog();
 private:
+	CCmdDialog();
+	void ClearLineL(RIoConsoleWriteHandle& aWriteHandle);
+private: // From CCommandBase.
+	virtual const TDesC& Name() const;
+	virtual void DoRunL();
+	virtual void OptionsL(RCommandOptionList& aOptions);
+	virtual void ArgumentsL(RCommandArgumentList& aArguments);
+private: // From CActive
+	void RunL();
+	void DoCancel();
+private: // From MCommandExtensionsV2
+	void CtrlCPressed();
+
+private:
+	HBufC* iTitle;
+	HBufC* iBody;
+	HBufC* iButton1;
+	HBufC* iButton2;
 	enum TMode
 		{
 		EModeNotifier,
 		EModeConsole,
 		EModeNull
 		};
-private:
-	CCmdDialog();
-	TMode ModeL() const;
-	void ClearLineL(RIoConsoleWriteHandle& aWriteHandle);
-private: // From CCommandBase.
-	virtual const TDesC& Name() const;
-	virtual void DoRunL();
-	virtual void OptionsL(RCommandOptionList& aOptions);
-	virtual void ArgumentsL(RCommandArgumentList& aArguments);
-private:
-	HBufC* iTitle;
-	HBufC* iBody;
-	HBufC* iButton1;
-	HBufC* iButton2;
+	TMode iMode;
+
+	RNotifier iNotifier;
+	TInt iReturnValue;
 	};
 
 #ifdef __WINS__