author | mickeyl <mickeyl> | 2005-08-24 16:20:09 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-08-24 16:20:09 (UTC) |
commit | f0bb6c410f19d502cf563254d95158617a32b94e (patch) (unidiff) | |
tree | 63f9953ae1a310f8c286ea62b449e16e6e9d74ce /libopie2/opiecore/device/odevice_abstractmobiledevice.cpp | |
parent | c1fc89afc42b1a8781b92b581f5be19916e2b69d (diff) | |
download | opie-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 (limited to 'libopie2/opiecore/device/odevice_abstractmobiledevice.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | libopie2/opiecore/device/odevice_abstractmobiledevice.cpp | 8 |
1 files changed, 6 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 | |||
@@ -60,13 +60,15 @@ void OAbstractMobileDevice::setAPMTimeOut( int time ) { | |||
60 | bool OAbstractMobileDevice::suspend() { | 60 | bool OAbstractMobileDevice::suspend() { |
61 | if ( !isQWS( ) ) // only qwsserver is allowed to suspend | 61 | if ( !isQWS( ) ) // only qwsserver is allowed to suspend |
62 | return false; | 62 | return false; |
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 ); |
70 | 72 | ||
71 | ::sync(); // flush fs caches | 73 | ::sync(); // flush fs caches |
72 | res = ( ::system ( "apm --suspend" ) == 0 ); | 74 | res = ( ::system ( "apm --suspend" ) == 0 ); |
@@ -79,17 +81,19 @@ bool OAbstractMobileDevice::suspend() { | |||
79 | do { // wait at most 1.5 sec: either suspend didn't work or the device resumed | 81 | do { // wait at most 1.5 sec: either suspend didn't work or the device resumed |
80 | ::usleep ( 200 * 1000 ); | 82 | ::usleep ( 200 * 1000 ); |
81 | ::gettimeofday ( &tvn, 0 ); | 83 | ::gettimeofday ( &tvn, 0 ); |
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 ... |
93 | #define OD_IOC(dir,type,number,size) (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 )) | 97 | #define OD_IOC(dir,type,number,size) (( dir << 30 ) | ( type << 8 ) | ( number ) | ( size << 16 )) |
94 | #define OD_IO(type,number) OD_IOC(0,type,number,0) | 98 | #define OD_IO(type,number) OD_IOC(0,type,number,0) |
95 | 99 | ||