update

1 files changed, 7 insertions, 1 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
@@ -16,17 +16,16 @@
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "desktop.h"
 #include "info.h"
 #include "launcher.h"
-//#include "mrulist.h"
 #include "qcopbridge.h"
 #include "shutdownimpl.h"
 #include "startmenu.h"
 #include "taskbar.h"
 #include "transferserver.h"
 #include "irserver.h"
 #include "packageslave.h"
 
@@ -164,16 +163,17 @@ public:
     m_enable_dim = false;
     m_enable_lightoff = false;
     m_enable_onlylcdoff = false;
 
     m_disable_suspend_ac = 100;
     m_enable_dim_ac = false;
     m_enable_lightoff_ac = false;
     m_enable_onlylcdoff_ac = false;
+    m_disable_apm_ac = false;
 
     m_lcd_status = true;
 
     m_backlight_normal = -1;
     m_backlight_current = -1;
     m_backlight_forcedoff = false;
 
     // Make sure the LCD is in fact on, (if opie was killed while the LCD is off it would still be off)
@@ -210,16 +210,20 @@ public:
           if ( m_disable_suspend_ac > 1 && m_enable_lightoff_ac && onAC ) {
               setBacklightInternal( 0 ); // off
           } else if ( m_disable_suspend > 1 && m_enable_lightoff ) {
               setBacklightInternal( 0 ); // off
           }
           return true;
           break;
       case 2:
+          if ( m_disable_apm_ac && onAC ) {
+              return true;
+          }
+
           if ( m_enable_onlylcdoff_ac && onAC ) {
               ODevice::inst ( ) -> setDisplayStatus ( false );
               m_lcd_status = false;
               return true;
           }
           else if ( m_enable_onlylcdoff ) {
               ODevice::inst ( ) -> setDisplayStatus ( false );
               m_lcd_status = false;
@@ -295,16 +299,17 @@ public:
 
     v [ 0 ] = QMAX( 1000 * i1, 100 );
     v [ 1 ] = QMAX( 1000 * i2, 100 );
     v [ 2 ] = QMAX( 1000 * i3, 100 );
     v [ 3 ] = 0;
     m_enable_dim_ac = ( ( i1 != 0 ) ? config.readNumEntry ( "DimAC", 1 ) : false );
     m_enable_lightoff_ac = ( ( i2 != 0 ) ? config.readNumEntry ( "LightOffAC", 1 ) : false );
     m_enable_onlylcdoff_ac = config.readNumEntry ( "LcdOffOnlyAC", 0 );
+    m_disable_apm_ac =  config.readNumEntry ( "NoApmAC", 0 );
 
     if ( !i1 && !i2 && !i3 )
       QWSServer::setScreenSaverInterval( 0 );
     else
       QWSServer::setScreenSaverIntervals( v );
   }
 
   void setInterval ( int interval )
@@ -367,16 +372,17 @@ private:
   bool m_enable_dim;
   bool m_enable_lightoff;
   bool m_enable_onlylcdoff;
 
   int m_disable_suspend_ac;
   bool m_enable_dim_ac;
   bool m_enable_lightoff_ac;
   bool m_enable_onlylcdoff_ac;
+  bool m_disable_apm_ac;
 
   bool m_lcd_status;
 
   int m_backlight_normal;
   int m_backlight_current;
   bool m_backlight_forcedoff;
 };