summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-08-24 16:20:09 (UTC)
committer mickeyl <mickeyl>2005-08-24 16:20:09 (UTC)
commitf0bb6c410f19d502cf563254d95158617a32b94e (patch) (unidiff)
tree63f9953ae1a310f8c286ea62b449e16e6e9d74ce
parentc1fc89afc42b1a8781b92b581f5be19916e2b69d (diff)
downloadopie-f0bb6c410f19d502cf563254d95158617a32b94e.zip
opie-f0bb6c410f19d502cf563254d95158617a32b94e.tar.gz
opie-f0bb6c410f19d502cf563254d95158617a32b94e.tar.bz2
fix STUPID bug by remembering that a QCopEnvelope is sent in the object destructor
sometimes C++ is too tricky for human beings :/
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiecore/device/odevice_abstractmobiledevice.cpp8
-rw-r--r--libopie2/opiecore/device/odevice_zaurus.cpp4
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() {
63 63
64 bool res = false; 64 bool res = false;
65 65
66 {
66 QCopEnvelope( "QPE/System", "aboutToSuspend()" ); 67 QCopEnvelope( "QPE/System", "aboutToSuspend()" );
68 }
67 69
68 struct timeval tvs, tvn; 70 struct timeval tvs, tvn;
69 ::gettimeofday ( &tvs, 0 ); 71 ::gettimeofday ( &tvs, 0 );
@@ -82,11 +84,13 @@ bool OAbstractMobileDevice::suspend() {
82 } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut ); 84 } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut );
83 } 85 }
84 86
85 return res; 87 {
86
87 QCopEnvelope( "QPE/System", "returnFromSuspend()" ); 88 QCopEnvelope( "QPE/System", "returnFromSuspend()" );
88} 89}
89 90
91 return res;
92}
93
90//#include <linux/fb.h> better not rely on kernel headers in userspace ... 94//#include <linux/fb.h> better not rely on kernel headers in userspace ...
91 95
92// _IO and friends are only defined in kernel headers ... 96// _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() {
712 return false; 712 return false;
713 713
714 bool res = false; 714 bool res = false;
715 {
715 QCopEnvelope( "QPE/System", "aboutToSuspend()" ); 716 QCopEnvelope( "QPE/System", "aboutToSuspend()" );
717 }
716 718
717 struct timeval tvs, tvn; 719 struct timeval tvs, tvn;
718 ::gettimeofday ( &tvs, 0 ); 720 ::gettimeofday ( &tvs, 0 );
@@ -732,7 +734,9 @@ bool Zaurus::suspend() {
732 } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut ); 734 } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < m_timeOut );
733 } 735 }
734 736
737 {
735 QCopEnvelope( "QPE/System", "returnFromSuspend()" ); 738 QCopEnvelope( "QPE/System", "returnFromSuspend()" );
739 }
736 740
737 return res; 741 return res;
738} 742}