- only allow sessions if all components (layer, widgetstack) are available

- add io_modem to .pro file so it gets compiled
- fix io_modem compilation (untested, but better than nothing)

4 files changed, 19 insertions, 6 deletions

diff --git a/noncore/apps/opie-console/io_modem.cpp b/noncore/apps/opie-console/io_modem.cpp
index eb0aeb7..56147d8 100644
--- a/noncore/apps/opie-console/io_modem.cpp
+++ b/noncore/apps/opie-console/io_modem.cpp
@@ -4,6 +4,6 @@
 #include "dialer.h"
 
-IOModem:IOModem( const Profile &config ) : IOSerial( config ) {
-        m_config = config;
+IOModem::IOModem( const Profile &profile )
+        : IOSerial( profile ),  m_profile( profile ) {
 }
 
@@ -21,4 +21,5 @@ void IOModem::close() {
 
 bool IOModem::open() {
+        qWarning("IOModem::open");
     IOSerial::open();
 
@@ -69,5 +70,6 @@ QString IOModem::name() const {
 }
 
-void IOIrda::slotExited(OProcess* proc ){
+void IOModem::slotExited(OProcess* proc ){
     close();
 }
+
diff --git a/noncore/apps/opie-console/io_modem.h b/noncore/apps/opie-console/io_modem.h
index 6d44349..d681f66 100644
--- a/noncore/apps/opie-console/io_modem.h
+++ b/noncore/apps/opie-console/io_modem.h
@@ -4,4 +4,5 @@
 #include <opie/oprocess.h>
 #include "io_serial.h"
+#include "profile.h"
 
 /* Default values to be used if the profile information is incomplete */
@@ -58,5 +59,5 @@ private:
 
     QString m_initString, m_resetString, m_dialPref1, m_dialSuf1, m_dialPref2,
-        m_dialSuf2, dialPref3, m_dialSuf3, m_connect, m_hangup, m_cancel;
+        m_dialSuf2, m_dialPref3, m_dialSuf3, m_connect, m_hangup, m_cancel;
     int  m_dialTime, m_delayRedial, m_numberTries, m_dtrDropTime,
         m_bpsDetect, m_dcdLines, m_multiLineUntag;
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index 415259e..1adb43d 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -7,4 +7,5 @@
 #include <qpe/resource.h>
 #include <opie/ofiledialog.h>
+#include <qmessagebox.h>
 
 #include "profileeditordialog.h"
@@ -310,4 +311,13 @@ void MainWindow::create( const Profile& prof ) {
     Session *ses = manager()->fromProfile( prof, tabWidget() );
 
+    if((!ses) || (!ses->layer()) || (!ses->widgetStack()))
+        {
+                QMessageBox::warning(this,
+                        QObject::tr("Session failed"),
+                        QObject::tr("Cannot open session: Not all components were found."));
+                //if(ses) delete ses;
+                return;
+        }
+
     m_sessions.append( ses );
     tabWidget()->add( ses );
diff --git a/noncore/apps/opie-console/opie-console.pro b/noncore/apps/opie-console/opie-console.pro
index ef6bc21..26bce83 100644
--- a/noncore/apps/opie-console/opie-console.pro
+++ b/noncore/apps/opie-console/opie-console.pro
@@ -3,5 +3,5 @@ TEMPLATE     = app
         CONFIG      = qt debug
 DESTDIR      = $(OPIEDIR)/bin
-HEADERS      = io_layer.h io_serial.h io_irda.h io_bt.h\
+HEADERS      = io_layer.h io_serial.h io_irda.h io_bt.h io_modem.h \
                file_layer.h filetransfer.h \
                metafactory.h \
@@ -36,5 +36,5 @@ HEADERS      = io_layer.h io_serial.h io_irda.h io_bt.h\
                    dialer.h
 
-SOURCES      = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp \
+SOURCES      = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp io_modem.cpp \
                file_layer.cpp filetransfer.cpp \
                main.cpp \