TDE
/
tdepowersave
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdepowersave
0
0
Fork 0
Code Issues Releases Wiki Activity

Third time's the charm...hopefully these popup problems are now fully repaired

Browse Source 
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpowersave@1115215 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
pull/1/head
tpearson 14 years ago
parent a33006bd3c
commit fe254d5058
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File

2
src/config/kpowersaverc_default
Unescape View File

@ -12,7 +12,7 @@ AutoSuspendCountdown=true
AutoSuspendCountdownTimeOut=30 AutoSuspendCountdownTimeOut=30
Autostart=true Autostart=true
AutostartNeverAsk=false AutostartNeverAsk=false
unmountExternalOnSuspend=true unmountExternalOnSuspend=false
callSetPowerSaveOnAC=true callSetPowerSaveOnAC=true
lockMethod=automatic lockMethod=automatic
timeToFakeKeyAfterLock=2500 timeToFakeKeyAfterLock=2500

14
src/kpowersave.cpp
Unescape View File

@ -2270,7 +2270,8 @@ void kpowersave::handleResumeSignal() {
} }
// handle result of the resume/suspend // handle result of the resume/suspend
if ((resume_result == 0) || (resume_result == INT_MAX)) { // 1 is a valid return code; don't error out when it is received!
if ((resume_result == 0) || (resume_result == 1) || (resume_result == INT_MAX)) {
if ( resume_result == INT_MAX ) if ( resume_result == INT_MAX )
kdWarning() << "Unknown if we successful resumed, look like a D-Bus timeout since " kdWarning() << "Unknown if we successful resumed, look like a D-Bus timeout since "
<< "elapsed time between suspend and resume is higher than 6 hours" << endl; << "elapsed time between suspend and resume is higher than 6 hours" << endl;
@ -2283,14 +2284,11 @@ void kpowersave::handleResumeSignal() {
this, i18n("Warning"), 15000); this, i18n("Warning"), 15000);
} }
} else { } else {
// 1 is a valid return code; don't error out when it is received! kdError() << "Unknown error while suspend. Errorcode: " << resume_result << endl;
if (resume_result != 1) { QString msg;
kdError() << "Unknown error while suspend. Errorcode: " << resume_result << endl;
QString msg;
msg = i18n("An unknown error occurred while %1. The errorcode is: '%2'"). msg = i18n("An unknown error occurred while %1. The errorcode is: '%2'").
arg(getSuspendString(calledSuspend)).arg(resume_result); arg(getSuspendString(calledSuspend)).arg(resume_result);
}
#if defined(DISTRO_IS_SUSE) || defined(DISTRO_IS_SLES_SLED) || defined(DISTRO_IS_PARDUS) #if defined(DISTRO_IS_SUSE) || defined(DISTRO_IS_SLES_SLED) || defined(DISTRO_IS_PARDUS)
// okay we know this system use pm-utils and log is under /var/log/pm-suspend.log // okay we know this system use pm-utils and log is under /var/log/pm-suspend.log

Write Preview
Loading…
Cancel
Save