summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-10-23 22:00:05 (UTC)
committer harlekin <harlekin>2002-10-23 22:00:05 (UTC)
commitf5ee7b6584fe8c6e03494a241e30854cd658bb71 (patch) (unidiff)
tree4b0a8769cc8fc82813802f75316f24a069489431
parent3c9835537b2fdccab4c0f720a4d77a98ad8bba10 (diff)
downloadopie-f5ee7b6584fe8c6e03494a241e30854cd658bb71.zip
opie-f5ee7b6584fe8c6e03494a241e30854cd658bb71.tar.gz
opie-f5ee7b6584fe8c6e03494a241e30854cd658bb71.tar.bz2
update
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/desktop.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp
index 33bea36..c4c6050 100644
--- a/core/launcher/desktop.cpp
+++ b/core/launcher/desktop.cpp
@@ -23,3 +23,2 @@
23#include "launcher.h" 23#include "launcher.h"
24//#include "mrulist.h"
25#include "qcopbridge.h" 24#include "qcopbridge.h"
@@ -171,2 +170,3 @@ public:
171 m_enable_onlylcdoff_ac = false; 170 m_enable_onlylcdoff_ac = false;
171 m_disable_apm_ac = false;
172 172
@@ -217,2 +217,6 @@ public:
217 case 2: 217 case 2:
218 if ( m_disable_apm_ac && onAC ) {
219 return true;
220 }
221
218 if ( m_enable_onlylcdoff_ac && onAC ) { 222 if ( m_enable_onlylcdoff_ac && onAC ) {
@@ -275,3 +279,3 @@ public:
275 m_enable_lightoff = ( ( i2 != 0 ) ? config. readNumEntry ( "LightOff", 1 ) : false ); 279 m_enable_lightoff = ( ( i2 != 0 ) ? config. readNumEntry ( "LightOff", 1 ) : false );
276 m_enable_onlylcdoff = config. readNumEntry ( "LcdOffOnly", 0 ); 280 m_enable_onlylcdoff = config.readNumEntry ( "LcdOffOnly", 0 );
277 281
@@ -302,2 +306,3 @@ public:
302 m_enable_onlylcdoff_ac = config.readNumEntry ( "LcdOffOnlyAC", 0 ); 306 m_enable_onlylcdoff_ac = config.readNumEntry ( "LcdOffOnlyAC", 0 );
307 m_disable_apm_ac = config.readNumEntry ( "NoApmAC", 0 );
303 308
@@ -374,2 +379,3 @@ private:
374 bool m_enable_onlylcdoff_ac; 379 bool m_enable_onlylcdoff_ac;
380 bool m_disable_apm_ac;
375 381