1 files changed, 25 insertions, 22 deletions

diff --git a/noncore/apps/opie-console/session.cpp b/noncore/apps/opie-console/session.cpp
index 7cae0df..f4fbcf2 100644
--- a/noncore/apps/opie-console/session.cpp
+++ b/noncore/apps/opie-console/session.cpp
@@ -4,4 +4,3 @@
 #include "file_layer.h"
-#include "widget_layer.h"
-#include "emulation_layer.h"
+#include "emulation_handler.h"
 #include "session.h"
@@ -12,4 +11,3 @@ Session::Session() {
     m_layer = 0l;
-//    m_widLay = 0l;
-//    m_emLay = 0l;
+    m_emu = 0l;
 }
@@ -20,2 +18,3 @@ Session::Session( const QString& na, QWidgetStack* widget, IOLayer* lay)
 //    m_emLay  = 0l;
+    m_emu = 0l;
 }
@@ -23,3 +22,3 @@ Session::~Session() {
     delete m_layer;
-//    delete m_emLay;
+    delete m_emu;
     delete m_widget;
@@ -36,5 +35,6 @@ IOLayer* Session::layer() {
 }
-/*EmulationLayer* Session::emulationLayer() {
-    return m_emLay;
+EmulationHandler* Session::emulationHandler() {
+    return m_emu;
 }
+/*
 WidgetLayer* Session::emulationWidget() {
@@ -44,14 +44,15 @@ WidgetLayer* Session::emulationWidget() {
 void Session::connect() {
-/*    if ( !m_layer || !m_emLay )
+    if ( !m_layer || !m_emu )
         return;
 
+    qWarning("connection in session");
     QObject::connect(m_layer, SIGNAL(received(const QByteArray&) ),
-            m_emLay, SLOT(onRcvBlock(const QByteArray&) ) );
-    QObject::connect(m_emLay, SIGNAL(sndBlock(const QByteArray&) ),
+            m_emu, SLOT(recv(const QByteArray&) ) );
+    QObject::connect(m_emu, SIGNAL(send(const QByteArray&) ),
             m_layer, SLOT(send(const QByteArray&) ) );
-            */
+
 }
 void Session::disconnect() {
-/*
-    if ( !m_layer || !m_emLay )
+
+    if ( !m_layer || !m_emu )
         return;
@@ -59,6 +60,5 @@ void Session::disconnect() {
     QObject::disconnect(m_layer, SIGNAL(received(const QByteArray&) ),
-            m_emLay, SLOT(onRcvBlock(const QByteArray&) ) );
-    QObject::disconnect(m_emLay, SIGNAL(sndBlock(const QByteArray&) ),
+            m_emu, SLOT(recv(const QByteArray&) ) );
+    QObject::disconnect(m_emu, SIGNAL(send(const QByteArray&) ),
             m_layer, SLOT(send(const QByteArray&) ) );
-            */
 }
@@ -68,5 +68,7 @@ void Session::setName( const QString& na){
 void Session::setWidgetStack( QWidgetStack* wid ) {
+    delete m_emu;
+    m_emu = 0l;
     delete m_widget;
     /* the EmulationLayer was destroyed... */
-    //delete m_emLay;
+
     m_widget = wid;
@@ -77,7 +79,8 @@ void Session::setIOLayer( IOLayer* lay ) {
 }
-/*
-void Session::setEmulationLayer( EmulationLayer* lay ) {
-    delete m_emLay;
-    m_emLay = lay;
+
+void Session::setEmulationHandler( EmulationHandler* lay ) {
+    delete m_emu;
+    m_emu = lay;
 }
+/*
 void Session::setEmulationWidget( WidgetLayer* lay ) {
@@ -86,2 +89,2 @@ void Session::setEmulationWidget( WidgetLayer* lay ) {
 }
-*/
\ No newline at end of file
+*/