summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/dialer.cpp6
-rw-r--r--noncore/apps/opie-console/dialer.h1
-rw-r--r--noncore/apps/opie-console/io_modem.cpp5
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp3
-rw-r--r--noncore/apps/opie-console/transferdialog.cpp4
-rw-r--r--noncore/apps/opie-console/transferdialog.h2
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
@@ -83,8 +83,14 @@ 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)
{
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
@@ -13,8 +13,9 @@ 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();
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
@@ -14,9 +14,12 @@ 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
@@ -441,10 +441,11 @@ 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();
}
}
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
@@ -16,10 +16,10 @@
#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;
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
@@ -15,9 +15,9 @@ 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();