From 2f32b6d589d389848c5c73ba2e5ad13117c1da9e Mon Sep 17 00:00:00 2001
From: korovkin <korovkin>
Date: Sun, 30 Apr 2006 08:54:54 +0000
Subject: Fixed bug with suspend reenabling.

Made some minor formatting.
---
(limited to 'noncore')

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
@@ -694,8 +694,11 @@ 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;
@@ -738,21 +741,31 @@ void BlueBase::doForward()
         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
 }
 
@@ -761,16 +774,20 @@ 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
@@ -278,7 +278,7 @@ void ObexFtpDialog::getFile()
         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"));
         }
--
cgit v0.9.0.2