- 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
@@ -1,13 +1,13 @@
 
 #include "io_modem.h"
 
 #include "dialer.h"
 
-IOModem:IOModem( const Profile &config ) : IOSerial( config ) {
-	m_config = config;
+IOModem::IOModem( const Profile &profile )
+	: IOSerial( profile ),  m_profile( profile ) {
 }
 
 
 IOModem::~IOModem() {
 
 }
@@ -17,12 +17,13 @@ void IOModem::close() {
 
     IOSerial::close();
 
 }
 
 bool IOModem::open() {
+	qWarning("IOModem::open");
     IOSerial::open();
 
 	Dialer d(m_profile);
 	int result = d.exec();
 	if(result == QDialog::Accepted)
 	{
@@ -65,9 +66,10 @@ QString IOModem::identifier() const {
 }
 
 QString IOModem::name() const {
     return "Modem IO Layer";
 }
 
-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
@@ -1,11 +1,12 @@
 #ifndef OPIE_IO_MODEM
 #define OPIE_IO_MODEM
 
 #include <opie/oprocess.h>
 #include "io_serial.h"
+#include "profile.h"
 
 /* Default values to be used if the profile information is incomplete */
 #define MODEM_DEFAULT_DEVICE       "/dev/ttyS0"
 #define MODEM_DEFAULT_BAUD         9600
 #define MODEM_DEFAULT_PARITY       0
 #define MODEM_DEFAULT_DBITS        8
@@ -54,13 +55,13 @@ public slots:
     void close();
     void reload(const Profile &);
 
 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;
 	const Profile& m_profile;
 
 private slots:
     void slotExited(OProcess* proc);
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
@@ -3,12 +3,13 @@
 #include <qmenubar.h>
 #include <qlabel.h>
 #include <qpopupmenu.h>
 #include <qtoolbar.h>
 #include <qpe/resource.h>
 #include <opie/ofiledialog.h>
+#include <qmessagebox.h>
 
 #include "profileeditordialog.h"
 #include "configdialog.h"
 #include "default.h"
 #include "metafactory.h"
 #include "profile.h"
@@ -306,12 +307,21 @@ void MainWindow::slotProfile( int id) {
     Profile prof = manager()->profile( m_sessionsPop->text( id)  );
     create( prof );
 }
 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 );
     m_curSession = 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
@@ -1,11 +1,11 @@
 TEMPLATE     = app
 #CONFIG       = qt warn_on release
 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 \
 	       session.h \
 	       mainwindow.h \
 	       profile.h \
 	       profileconfig.h \
@@ -32,13 +32,13 @@ HEADERS      = io_layer.h io_serial.h io_irda.h io_bt.h\
                emulation_widget.h procctl.h \
            function_keyboard.h \
 	       receive_layer.h filereceive.h \
 	       script.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 \
 	       metafactory.cpp \
 	       session.cpp \
 	       mainwindow.cpp \
 	       profile.cpp \