summaryrefslogtreecommitdiff
authorkorovkin <korovkin>2006-04-30 08:54:54 (UTC)
committer korovkin <korovkin>2006-04-30 08:54:54 (UTC)
commit2f32b6d589d389848c5c73ba2e5ad13117c1da9e (patch) (side-by-side diff)
treeec8a086ad17e3fa9014baa9476ab9cc77c5c29dc
parentb91d3399fbd3178085e9d0fc5faeefbe31c674b7 (diff)
downloadopie-2f32b6d589d389848c5c73ba2e5ad13117c1da9e.zip
opie-2f32b6d589d389848c5c73ba2e5ad13117c1da9e.tar.gz
opie-2f32b6d589d389848c5c73ba2e5ad13117c1da9e.tar.bz2
Fixed bug with suspend reenabling.
Made some minor formatting.
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
@@ -695,6 +695,9 @@ BlueBase::~BlueBase()
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;
@@ -739,10 +742,15 @@ void BlueBase::doForward()
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"),
@@ -750,8 +758,13 @@ void BlueBase::doForward()
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
}
@@ -762,14 +775,18 @@ void BlueBase::doForward()
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");
}
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
@@ -279,5 +279,5 @@ void ObexFtpDialog::getFile()
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"));