# HG changeset patch
# User Tom Sutcliffe <thomas.sutcliffe@accenture.com>
# Date 1282819624 -3600
# Node ID d9b3ed11f0174cd1adc4fd3e5f3c823d44314a05
# Parent  e7ccdc7f7dbe1e8d3529d42e310db87431428a40# Parent  534b01198c2dad43b51c6438cbe9ffeab388a465
merge from MCL

diff -r 534b01198c2d -r d9b3ed11f017 plugins/consoles/guicons/s60/data/New_BT_console.txt
--- a/plugins/consoles/guicons/s60/data/New_BT_console.txt	Thu Aug 26 00:49:35 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-fshell --console vt100btcons
\ No newline at end of file
diff -r 534b01198c2d -r d9b3ed11f017 plugins/consoles/guicons/s60/data/New_TCP_console.txt
--- a/plugins/consoles/guicons/s60/data/New_TCP_console.txt	Thu Aug 26 00:49:35 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-fshell --console vt100tcpcons --console-title port=8080
\ No newline at end of file
diff -r 534b01198c2d -r d9b3ed11f017 plugins/consoles/guicons/s60/data/New_busdevcomm_console.txt
--- a/plugins/consoles/guicons/s60/data/New_busdevcomm_console.txt	Thu Aug 26 00:49:35 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-fshell --console vt100busdevcons --console-title pdd=euart1,ldd=ecomm,rate=115200,port=0
diff -r 534b01198c2d -r d9b3ed11f017 plugins/consoles/guicons/s60/data/New_serial_console.txt
--- a/plugins/consoles/guicons/s60/data/New_serial_console.txt	Thu Aug 26 00:49:35 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-fshell --console vt100cons --console-title pdd=euart1,ldd=ecomm,csy=ecuart,rate=115200,port=comm::0
diff -r 534b01198c2d -r d9b3ed11f017 plugins/consoles/guicons/s60/data/Terminal_Keyboard.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/consoles/guicons/s60/data/Terminal_Keyboard.txt	Thu Aug 26 11:47:04 2010 +0100
@@ -0,0 +1,1 @@
+fshell --console terminalkeyboardcons --console-size 120,40
diff -r 534b01198c2d -r d9b3ed11f017 plugins/consoles/guicons/s60/data/comm.script.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/consoles/guicons/s60/data/comm.script.txt	Thu Aug 26 11:47:04 2010 +0100
@@ -0,0 +1,1 @@
+fshell comm.script
diff -r 534b01198c2d -r d9b3ed11f017 plugins/consoles/guicons/s60/group/bld.inf
--- a/plugins/consoles/guicons/s60/group/bld.inf	Thu Aug 26 00:49:35 2010 +0100
+++ b/plugins/consoles/guicons/s60/group/bld.inf	Thu Aug 26 11:47:04 2010 +0100
@@ -19,10 +19,8 @@
 
 ..\data\guicons.idf	z:\resource\guicons.idf
 
-..\data\New_BT_console.txt z:\system\console\commands\100-New_BT_console.txt
-..\data\New_TCP_console.txt z:\system\console\commands\101-New_TCP_console.txt
-..\data\New_serial_console.txt z:\system\console\commands\102-New_serial_console.txt
-..\data\New_busdevcomm_console.txt z:\system\console\commands\103-New_busdevcomm_console.txt
+..\data\comm.script.txt z:\system\console\commands\100-comm.script.txt
+..\data\Terminal_Keyboard.txt z:\system\console\commands\101-Terminal_Keyboard.txt
 
 PRJ_MMPFILES
 s60_guicons.mmp
diff -r 534b01198c2d -r d9b3ed11f017 plugins/consoles/guicons/s60/group/s60_guicons.iby
--- a/plugins/consoles/guicons/s60/group/s60_guicons.iby	Thu Aug 26 00:49:35 2010 +0100
+++ b/plugins/consoles/guicons/s60/group/s60_guicons.iby	Thu Aug 26 11:47:04 2010 +0100
@@ -23,9 +23,9 @@
 FSHELL_DATA_FILE(ZRESOURCE\guiconsbg.png, \resource\guiconsbg.png)
 #endif
 
-FSHELL_DATA_FILE(ZSYSTEM\console\commands\100-New_BT_console.txt, system\console\commands\100-New_BT_console.txt)
-FSHELL_DATA_FILE(ZSYSTEM\console\commands\101-New_TCP_console.txt, system\console\commands\101-New_TCP_console.txt)
-FSHELL_DATA_FILE(ZSYSTEM\console\commands\102-New_serial_console.txt, system\console\commands\102-New_serial_console.txt)
-FSHELL_DATA_FILE(ZSYSTEM\console\commands\103-New_busdevcomm_console.txt, system\console\commands\103-New_busdevcomm_console.txt)
+FSHELL_DATA_FILE(ZSYSTEM\console\commands\100-comm.script.txt, system\console\commands\100-comm.script.txt)
+#ifdef FSHELL_TRACECORE_SUPPORT
+FSHELL_DATA_FILE(ZSYSTEM\console\commands\101-Terminal_Keyboard.txt, system\console\commands\101-Terminal_Keyboard.txt)
+#endif
 
 #endif //__S60_GUICONS_IBY__
diff -r 534b01198c2d -r d9b3ed11f017 plugins/consoles/terminalkeyboardcons/terminalkeyboardcons.h
--- a/plugins/consoles/terminalkeyboardcons/terminalkeyboardcons.h	Thu Aug 26 00:49:35 2010 +0100
+++ b/plugins/consoles/terminalkeyboardcons/terminalkeyboardcons.h	Thu Aug 26 11:47:04 2010 +0100
@@ -60,7 +60,6 @@
 	TBool iGotKey;
 	TKeyCode iKeyCode;
 	TUint iKeyModifiers;
-	CConsoleBase* iUnderlyingConsole;
 	RTcDriver iDriver;
 
 	RBuf iTextBuffer;