|
|
|
@ -2270,8 +2270,7 @@ void kpowersave::handleResumeSignal() {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// handle result of the resume/suspend
|
|
|
|
|
// 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 == 0) || (resume_result == INT_MAX)) {
|
|
|
|
|
if ( resume_result == INT_MAX )
|
|
|
|
|
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;
|
|
|
|
@ -2284,11 +2283,14 @@ void kpowersave::handleResumeSignal() {
|
|
|
|
|
this, i18n("Warning"), 15000);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
// 1 is a valid return code; don't error out when it is received!
|
|
|
|
|
if (resume_result != 1) {
|
|
|
|
|
kdError() << "Unknown error while suspend. Errorcode: " << resume_result << endl;
|
|
|
|
|
QString msg;
|
|
|
|
|
|
|
|
|
|
msg = i18n("An unknown error occurred while %1. The errorcode is: '%2'").
|
|
|
|
|
arg(getSuspendString(calledSuspend)).arg(resume_result);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#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
|
|
|
|
|