4 files changed, 13 insertions, 5 deletions

diff --git a/noncore/apps/opie-console/default.cpp b/noncore/apps/opie-console/default.cpp
index ce5c870..5c1c05a 100644
--- a/noncore/apps/opie-console/default.cpp
+++ b/noncore/apps/opie-console/default.cpp
@@ -1,11 +1,12 @@
 #include "io_serial.h"
 #include "io_irda.h"
 #include "io_bt.h"
+#include "io_modem.h"
 #include "filetransfer.h"
 #include "filereceive.h"
 #include "serialconfigwidget.h"
 #include "irdaconfigwidget.h"
 #include "btconfigwidget.h"
 #include "modemconfigwidget.h"
 #include "terminalwidget.h"
 #include "vt102emulation.h"
@@ -40,16 +41,19 @@ extern "C" {
         return new IOSerial( prof );
     }
     IOLayer* newBTLayer( const Profile& prof ) {
         return new IOBt( prof );
     }
     IOLayer* newIrDaLayer( const Profile& prof ) {
         return new IOIrda( prof );
     }
+    IOLayer* newModemLayer( const Profile& prof ) {
+        return new IOModem( prof );
+    }
 
     // Connection Widgets
     ProfileDialogWidget* newSerialWidget( const QString& str, QWidget* wid ) {
         return new SerialConfigWidget( str, wid );
     }
     ProfileDialogWidget* newIrDaWidget( const QString& str, QWidget* wid ) {
         return new IrdaConfigWidget( str, wid );
     }
@@ -80,16 +84,17 @@ Default::Default( MetaFactory* fact ) {
 
     fact->addReceiveLayer( "SZ", QObject::tr("Z-Modem"), newSZReceive );
     fact->addReceiveLayer( "SY", QObject::tr("Y-Modem"), newSYReceive );
     fact->addReceiveLayer( "SX", QObject::tr("X-Modem"), newSXReceive );
 
     fact->addIOLayerFactory( "serial", QObject::tr("Serial"), newSerialLayer );
     fact->addIOLayerFactory( "irda", QObject::tr("Infrared"), newIrDaLayer   );
     fact->addIOLayerFactory( "bt", QObject::tr("Bluetooth"),  newBTLayer     );
+    fact->addIOLayerFactory( "modem", QObject::tr("Modem"),   newModemLayer  );
 
     fact->addConnectionWidgetFactory( "serial", QObject::tr("Serial"), newSerialWidget );
     fact->addConnectionWidgetFactory( "irda", QObject::tr("Infrared"), newIrDaWidget );
     fact->addConnectionWidgetFactory( "modem", QObject::tr("Modem"), newModemWidget );
     fact->addConnectionWidgetFactory( "bt", QObject::tr("Bluetooth"), newBTWidget );
 
 //    fact->addTerminalWidgetFactory( "default", QObject::tr("Default Terminal"),  newTerminalWidget );
 
diff --git a/noncore/apps/opie-console/dialer.cpp b/noncore/apps/opie-console/dialer.cpp
index d20965a..90e2b6c 100644
--- a/noncore/apps/opie-console/dialer.cpp
+++ b/noncore/apps/opie-console/dialer.cpp
@@ -40,23 +40,22 @@
 
 // from modemconfigwidget
 //int rad_flow = prof.readNumEntry("Flow");
 //int rad_parity = prof.readNumEntry("Parity");
 //int speed = prof.readNumEntry("Speed");
 //QString number = prof.readEntry("Number");
 
 Dialer::Dialer(const Profile& profile, QWidget *parent, const char *name)
-: QDialog(parent, name, true)
+: QDialog(parent, name, true), m_profile(profile)
 {
 	QVBoxLayout *vbox;
 	QLabel *desc;
 
 	usercancel = 0;
-	m_profile = profile;
 
 	desc = new QLabel(QObject::tr("Dialing number: %1").arg(m_profile.readEntry("Number")), this);
 	progress = new QProgressBar(this);
 	status = new QLabel("", this);
 	status->setFrameStyle(QFrame::Panel | QFrame::Sunken);
 	cancel = new QPushButton(QObject::tr("Cancel"), this);
 
 	vbox = new QVBoxLayout(this, 2);
diff --git a/noncore/apps/opie-console/dialer.h b/noncore/apps/opie-console/dialer.h
index 8c83bb6..09cc5ca 100644
--- a/noncore/apps/opie-console/dialer.h
+++ b/noncore/apps/opie-console/dialer.h
@@ -39,13 +39,13 @@ class Dialer : public QDialog
 			state_online
 		};
 
 		QLabel *status;
 		QProgressBar *progress;
 		QPushButton *cancel;
 		int state;
 		int usercancel;
-		Profile m_profile;
+		const Profile& m_profile;
 };
 
 #endif
 
diff --git a/noncore/apps/opie-console/io_modem.cpp b/noncore/apps/opie-console/io_modem.cpp
index 56147d8..28d1722 100644
--- a/noncore/apps/opie-console/io_modem.cpp
+++ b/noncore/apps/opie-console/io_modem.cpp
@@ -15,20 +15,24 @@ IOModem::~IOModem() {
 
 void IOModem::close() {
 
     IOSerial::close();
 
 }
 
 bool IOModem::open() {
-	qWarning("IOModem::open");
-    IOSerial::open();
+    bool ret = IOSerial::open();
+	if(!ret) return false;
+
+	qWarning("IOModem::open continues...");
 
 	Dialer d(m_profile);
+	qWarning("dialer created");
+
 	int result = d.exec();
 	if(result == QDialog::Accepted)
 	{
 		return true;
 	}
 	else return false;
 }