fix STUPID bug by remembering that a QCopEnvelope is sent in the object destructor

sometimes C++ is too tricky for human beings :/

2 files changed, 10 insertions, 2 deletions

diff --git a/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp b/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp
index fe5864b..dbe9364 100644
--- a/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp
+++ b/libopie2/opiecore/device/odevice_abstractmobiledevice.cpp
@@ -63,7 +63,9 @@ bool OAbstractMobileDevice::suspend() {
 
     bool res = false;
 
+    {
     QCopEnvelope( "QPE/System", "aboutToSuspend()" );
+    }
 
     struct timeval tvs, tvn;
     ::gettimeofday ( &tvs, 0 );
@@ -82,11 +84,13 @@ bool OAbstractMobileDevice::suspend() {
         } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut );
     }
 
-    return res;
-
+    {
     QCopEnvelope( "QPE/System", "returnFromSuspend()" );
 }
 
+    return res;
+}
+
 //#include <linux/fb.h> better not rely on kernel headers in userspace ...
 
 // _IO and friends are only defined in kernel headers ...
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp
index 4a80a7e..5d48488 100644
--- a/libopie2/opiecore/device/odevice_zaurus.cpp
+++ b/libopie2/opiecore/device/odevice_zaurus.cpp
@@ -712,7 +712,9 @@ bool Zaurus::suspend() {
         return false;
 
     bool res = false;
+    {
     QCopEnvelope( "QPE/System", "aboutToSuspend()" );
+    }
 
     struct timeval tvs, tvn;
     ::gettimeofday ( &tvs, 0 );
@@ -732,7 +734,9 @@ bool Zaurus::suspend() {
         } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut );
     }
 
+    {
     QCopEnvelope( "QPE/System", "returnFromSuspend()" );
+    }
 
     return res;
 }