- implement proper disconnect for modem connections

- let transfer dialog use widgetStack()

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
@@ -81,12 +81,18 @@ Dialer::Dialer(const Profile& profile, int fd, QWidget *parent, const char *name
 }
 
 Dialer::~Dialer()
 {
 }
 
+void Dialer::setHangupOnly()
+{
+        state = state_cancel;
+        usercancel = 1;
+}
+
 void Dialer::slotCancel()
 {
         if(state != state_online)
         {
                 usercancel = 1;
                 reset();
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
@@ -11,12 +11,13 @@ class QProgressBar;
 class Dialer : public QDialog
 {
         Q_OBJECT
         public:
                 Dialer(const Profile& profile, int fd, QWidget *parent = NULL, const char *name = NULL);
                 ~Dialer();
+                void setHangupOnly();
 
         public slots:
                 void slotCancel();
                 void slotAutostart();
 
         private:
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
@@ -12,13 +12,16 @@ IOModem::IOModem( const Profile &profile )
 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();
 }
 
 bool IOModem::open() {
     bool ret = IOSerial::open();
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
@@ -439,14 +439,15 @@ void MainWindow::create( const Profile& prof ) {
     }
 }
 
 void MainWindow::slotTransfer()
 {
     if ( currentSession() ) {
-        TransferDialog dlg(this);
+        TransferDialog dlg(currentSession()->widgetStack(), this);
         dlg.showMaximized();
+        //currentSession()->widgetStack()->add(dlg);
         dlg.exec();
     }
 }
 
 
 void MainWindow::slotOpenKeb(bool state) {
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
@@ -14,14 +14,14 @@
 #include "receive_layer.h"
 #include "metafactory.h"
 #include "mainwindow.h"
 
 #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;
         m_recvlay = 0l;
         QVBoxLayout *vbox, *vbox2;
         QHBoxLayout *hbox, *hbox2, *hbox3;
         QLabel *file, *mode, *progress, *status;
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
@@ -13,13 +13,13 @@ class FileTransferLayer;
 class ReceiveLayer;
 
 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();
 
         public slots:
                 void slotFilename();
                 void slotTransfer();
                 void slotCancel();