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

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpowersave@1115215 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

src/config/kpowersaverc_default

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

src/kpowersave.cpp

@@ -2270,7 +2270,8 @@ void kpowersave::handleResumeSignal() {
 	}
 
 	// 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 )
 			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;
@@ -2283,14 +2284,11 @@ void kpowersave::handleResumeSignal() {
 						this, i18n("Warning"), 15000);
 		}
 	} 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)
 		// okay we know this system use pm-utils and log is under /var/log/pm-suspend.log