Initial import of Trinity 3.5.11 to kdebase

Extends krandrtray, adds iccconfig kcontrol module, adds run dialog autocomplete and lots of bugfixes
Will need to check for commit warnings and repair as encountered
Also needs full compile test

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

1 files changed, 2 insertions, 2 deletions

diff --git a/kcontrol/kdm/kdm-shut.cpp b/kcontrol/kdm/kdm-shut.cpp
index c958e1464..2eb88ac51 100644
--- a/kcontrol/kdm/kdm-shut.cpp
+++ b/kcontrol/kdm/kdm-shut.cpp
@@ -200,7 +200,7 @@ void KDMSessionsWidget::load()
 
   config->setGroup("Shutdown");
   restart_lined->setURL(config->readEntry("RebootCmd", "/sbin/reboot"));
-  shutdown_lined->setURL(config->readEntry("HaltCmd", "/sbin/halt"));
+  shutdown_lined->setURL(config->readEntry("HaltCmd", "/sbin/poweroff"));
 
   bm_combo->setCurrentId(config->readEntry("BootManager", "None"));
 }
@@ -210,7 +210,7 @@ void KDMSessionsWidget::load()
 void KDMSessionsWidget::defaults()
 {
   restart_lined->setURL("/sbin/reboot");
-  shutdown_lined->setURL("/sbin/halt");
+  shutdown_lined->setURL("/sbin/poweroff");
 
   sdlcombo->setCurrentItem(SdAll);
   sdrcombo->setCurrentItem(SdRoot);