summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp39
-rw-r--r--noncore/net/opietooth/manager/obexftpdialog.cpp2
2 files changed, 29 insertions, 12 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 58f97fa..85385d8 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -691,14 +691,17 @@ void BlueBase::setInfo()
*/
BlueBase::~BlueBase()
{
writeSavedDevices();
if (forwarder) {
#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
- QCopEnvelope("QPE/System", "setScreenSaverMode(int)" )
- << QPEApplication::Enable;
+ {
+ odebug << "SUSP: Enable suspend mode" << oendl;
+ QCopEnvelope e("QPE/System", "setScreenSaverMode(int)" );
+ e << QPEApplication::Enable;
+ }
#endif
delete forwarder;
forwarder = NULL;
}
delete m_iconLoader;
}
@@ -735,45 +738,59 @@ void BlueBase::doForward()
{
if (forwarder && forwarder->isRunning()) {
runButton->setText("start gateway");
forwarder->stop();
delete forwarder;
forwarder = NULL;
+#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
+ {
+ odebug << "SUSP: Enable suspend mode" << oendl;
+ QCopEnvelope e("QPE/System", "setScreenSaverMode(int)" );
+ e << QPEApplication::Enable;
+ }
+#endif
return;
}
QString str = serDevName->text();
forwarder = new SerialForwarder(str, speeds[serSpeed->currentItem()].val);
- connect(forwarder, SIGNAL(processExited(Opie::Core::OProcess*)),
- this, SLOT(forwardExited(Opie::Core::OProcess*)));
if (forwarder->start(OProcess::NotifyOnExit) < 0) {
QMessageBox::critical(this, tr("Forwarder Error"),
tr("Forwarder start error:") + tr(strerror(errno)));
return;
}
+ connect(forwarder, SIGNAL(processExited(Opie::Core::OProcess*)),
+ this, SLOT(forwardExited(Opie::Core::OProcess*)));
runButton->setText("stop gateway");
#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
- QCopEnvelope("QPE/System", "setScreenSaverMode(int)")
- << QPEApplication::DisableSuspend;
+ {
+ odebug << "SUSP: Disable suspend mode" << oendl;
+ QCopEnvelope e("QPE/System", "setScreenSaverMode(int)");
+ e << QPEApplication::DisableSuspend;
+ }
#endif
}
/**
* React on the process end
*/
void BlueBase::forwardExit(Opie::Core::OProcess* proc)
{
+ odebug << "Process exited" << oendl;
#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
- QCopEnvelope("QPE/System", "setScreenSaverMode(int)" )
- << QPEApplication::Enable;
+ if (forwarder) {
+ delete forwarder;
+ forwarder = NULL;
+ runButton->setText("start gateway");
+ odebug << "SUSP: Enable suspend mode" << oendl;
+ QCopEnvelope e("QPE/System", "setScreenSaverMode(int)" );
+ e << QPEApplication::Enable;
+ }
#endif
if (proc->exitStatus() != 0)
QMessageBox::critical(this, tr("Forwarder Error"),
tr("Forwarder start error"));
- delete proc;
- forwarder = NULL;
- runButton->setText("start gateway");
}
/**
* Encrypt entered passkey
* doit - do encryption of the key
*/
diff --git a/noncore/net/opietooth/manager/obexftpdialog.cpp b/noncore/net/opietooth/manager/obexftpdialog.cpp
index fd2015e..2f04ecf 100644
--- a/noncore/net/opietooth/manager/obexftpdialog.cpp
+++ b/noncore/net/opietooth/manager/obexftpdialog.cpp
@@ -275,13 +275,13 @@ void ObexFtpDialog::getFile()
progressStatus = 0;
fileProgress->setTotalSteps(file->getsize() / 1024);
fileProgress->reset();
status(tr("Receiving file ") + file2get);
result = obexftp_get(client, local, file2get);
if (result < 0) {
- log(file2get + QString(" receive ERROR:\n") + tr(strerror(errno)));
+ log(file2get + QString(" receive ERROR:\n") + tr(strerror(errno)));
errBox(file2get + QString(" receive ERROR"));
status(file2get + QString(" receive ERROR"));
}
else {
log(file2get + QString(" received"));
status(file2get + QString(" received"));