--- kshutdown/actions.cpp	2006-05-24 07:49:50.000000000 +0200
+++ actions.cpp	2007-04-27 17:33:17.000000000 +0200
@@ -101,7 +101,7 @@
 
 	_totalExit = false;
 
-	Method method = Method_KDE;
+	Method method = Method_DefaultCommand;
 	QString command;
 
 	if (!isEnabled(action))
@@ -149,8 +149,8 @@
 			getMethod(action, method, command);
 			MiscUtils::runCommandBeforeAction("Logout");
 
-			if (method == Method_KDE)
-				return endSession(KApplication::ShutdownTypeNone, action);
+			//if (method == Method_KDE)
+			return endSession(KApplication::ShutdownTypeNone, action);
 
 			break;
 
@@ -271,7 +271,7 @@
 	KConfig *conf = kshutdownrc->config();
 	if (!conf->hasGroup(group))
 	{
-		method = Method_KDE;
+		method = Method_DefaultCommand;
 		command = defaultCommand;
 		// kdDebug() << "Action::getMethod: No group in config for action " << action << endl;
 
@@ -281,9 +281,9 @@
 	conf->setGroup(group);
 
 	// read method
-	method = (Method)conf->readNumEntry("Method", Method_KDE);
+	method = (Method)conf->readNumEntry("Method", Method_DefaultCommand);
 	if ((method < Method_KDE) || (method > Method_UserCommand))
-		method = Method_KDE;
+		method = Method_DefaultCommand;
 
 	switch (method)
 	{
@@ -296,7 +296,7 @@
 		case Method_UserCommand:
 			command = conf->readEntry("Command", defaultCommand);
 			if (command.isEmpty())
-				method = Method_KDE;
+				method = Method_DefaultCommand;
 			break;
 	}
 
@@ -387,7 +387,7 @@
 	QString command;
 	getMethod(LockScreen, method, command);
 	MiscUtils::runCommandBeforeAction("Lock Screen");
-	if (method == Method_KDE) {
+	if (method == Method_DefaultCommand) {
 		// test mode
 		if (_testMode) {
 			MiscUtils::showTestMessage(getName(LockScreen));