6 files changed, 16 insertions, 5 deletions

diff --git a/noncore/apps/opie-console/dialer.cpp b/noncore/apps/opie-console/dialer.cpp
index bd6b50f..7bf9352 100644
--- a/noncore/apps/opie-console/dialer.cpp
+++ b/noncore/apps/opie-console/dialer.cpp
@@ -85,4 +85,10 @@ Dialer::~Dialer()
 }
 
+void Dialer::setHangupOnly()
+{
+        state = state_cancel;
+        usercancel = 1;
+}
+
 void Dialer::slotCancel()
 {
diff --git a/noncore/apps/opie-console/dialer.h b/noncore/apps/opie-console/dialer.h
index 4011880..84444b9 100644
--- a/noncore/apps/opie-console/dialer.h
+++ b/noncore/apps/opie-console/dialer.h
@@ -15,4 +15,5 @@ class Dialer : public QDialog
                 Dialer(const Profile& profile, int fd, QWidget *parent = NULL, const char *name = NULL);
                 ~Dialer();
+                void setHangupOnly();
 
         public slots:
diff --git a/noncore/apps/opie-console/io_modem.cpp b/noncore/apps/opie-console/io_modem.cpp
index c04aad1..2f0c04e 100644
--- a/noncore/apps/opie-console/io_modem.cpp
+++ b/noncore/apps/opie-console/io_modem.cpp
@@ -16,5 +16,8 @@ IOModem::~IOModem() {
 
 void IOModem::close() {
-        // maybe do a hangup here just in case...?
+        // Hangup, discarding result
+        Dialer d(m_profile, rawIO());
+        d.setHangupOnly();
+        d.exec();
 
     IOSerial::close();
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index 9a226bb..55e9836 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -443,6 +443,7 @@ void MainWindow::slotTransfer()
 {
     if ( currentSession() ) {
-        TransferDialog dlg(this);
+        TransferDialog dlg(currentSession()->widgetStack(), this);
         dlg.showMaximized();
+        //currentSession()->widgetStack()->add(dlg);
         dlg.exec();
     }
diff --git a/noncore/apps/opie-console/transferdialog.cpp b/noncore/apps/opie-console/transferdialog.cpp
index f9a0b87..ac5b1d0 100644
--- a/noncore/apps/opie-console/transferdialog.cpp
+++ b/noncore/apps/opie-console/transferdialog.cpp
@@ -18,6 +18,6 @@
 #include "transferdialog.h"
 
-TransferDialog::TransferDialog(MainWindow *parent, const char *name)
-: QDialog(0l, 0l, true), m_win(parent)
+TransferDialog::TransferDialog(QWidget *parent, MainWindow *mainwindow, const char *name)
+: QDialog(parent, 0l, true), m_win(mainwindow)
 {
     m_lay = 0l;
diff --git a/noncore/apps/opie-console/transferdialog.h b/noncore/apps/opie-console/transferdialog.h
index 1b27f16..d87be6a 100644
--- a/noncore/apps/opie-console/transferdialog.h
+++ b/noncore/apps/opie-console/transferdialog.h
@@ -17,5 +17,5 @@ class TransferDialog : public QDialog
         Q_OBJECT
         public:
-                TransferDialog(MainWindow *parent = 0l, const char *name = 0l);
+                TransferDialog(QWidget *parent = 0l, MainWindow *mainwindow = 0l, const char *name = 0l);
                 ~TransferDialog();