|
|
@ -1262,7 +1262,7 @@ void kpowersave::_quit (){
|
|
|
|
kdDebugFuncIn(trace);
|
|
|
|
kdDebugFuncIn(trace);
|
|
|
|
|
|
|
|
|
|
|
|
// set the KDE-Settings back to user default
|
|
|
|
// set the KDE-Settings back to user default
|
|
|
|
if(getenv("KDE_FULL_SESSION")) {
|
|
|
|
if(getenv("TDE_FULL_SESSION")) {
|
|
|
|
// first try to call the KDE method via DCOP to reset, if not fall back
|
|
|
|
// first try to call the KDE method via DCOP to reset, if not fall back
|
|
|
|
if (!display->resetKDEScreensaver()) {
|
|
|
|
if (!display->resetKDEScreensaver()) {
|
|
|
|
settings->load_kde();
|
|
|
|
settings->load_kde();
|
|
|
@ -1800,7 +1800,7 @@ void kpowersave::setSchemeSettings(){
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
} // TODO: check if this really work !!!
|
|
|
|
} // TODO: check if this really work !!!
|
|
|
|
else if(getenv("KDE_FULL_SESSION")) {
|
|
|
|
else if(getenv("TDE_FULL_SESSION")) {
|
|
|
|
// try to reset the complete screensaver settings. Ff this fail, use own methodes
|
|
|
|
// try to reset the complete screensaver settings. Ff this fail, use own methodes
|
|
|
|
if (!display->resetKDEScreensaver()) {
|
|
|
|
if (!display->resetKDEScreensaver()) {
|
|
|
|
settings->load_kde();
|
|
|
|
settings->load_kde();
|
|
|
@ -1836,7 +1836,7 @@ void kpowersave::setSchemeSettings(){
|
|
|
|
settings->powerOffAfter);
|
|
|
|
settings->powerOffAfter);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if(getenv("KDE_FULL_SESSION")){
|
|
|
|
else if(getenv("TDE_FULL_SESSION")){
|
|
|
|
// try to reset the KDE screensaver/DPMS settings (if there are also
|
|
|
|
// try to reset the KDE screensaver/DPMS settings (if there are also
|
|
|
|
// no special screensaver settings) otherwise fall back and set values from files
|
|
|
|
// no special screensaver settings) otherwise fall back and set values from files
|
|
|
|
if (!settings->specSsSettings && !display->resetKDEScreensaver()) {
|
|
|
|
if (!settings->specSsSettings && !display->resetKDEScreensaver()) {
|
|
|
|