[kde-freebsd] [RFC] fix defaults on kcontrol/kdm

[David Naylor]

Hi,

Attached is a patch that fixes the defaults for shutdown and reboot commands.  
This only affects the kcontrol module.  The implicit defaults for the config 
file 
are correct.  

I've filed a bug report (https://bugs.kde.org/show_bug.cgi?id=250989).  

If appropriate please commit to ports/area51.  

Regards,

David

--- kcontrol/kdm/kdm-shut.cpp~	2010-09-14 18:48:33.000000000 +0200
+++ kcontrol/kdm/kdm-shut.cpp	2010-09-14 18:50:05.000000000 +0200
@@ -76,7 +76,7 @@
     shutdown_label->setBuddy(shutdown_lined);
     connect(shutdown_lined, SIGNAL(textChanged(const QString &)),
             SIGNAL(changed()));
-    wtstr = i18n("Command to initiate the system halt. Typical value: /sbin/halt");
+    wtstr = i18n("Command to initiate the system halt. Typical value: /sbin/shutdown -p now");
     shutdown_label->setWhatsThis(wtstr);
     shutdown_lined->setWhatsThis(wtstr);
 
@@ -85,7 +85,7 @@
     restart_label->setBuddy(restart_lined);
     connect(restart_lined, SIGNAL(textChanged(const QString &)),
             SIGNAL(changed()));
-    wtstr = i18n("Command to initiate the system reboot. Typical value: /sbin/reboot");
+    wtstr = i18n("Command to initiate the system reboot. Typical value: /sbin/shutdown -r now");
     restart_label->setWhatsThis(wtstr);
     restart_lined->setWhatsThis(wtstr);
 
@@ -187,16 +187,16 @@
     readSD(sdrcombo, "Root", config->group("X-*-Core"));
 
     KConfigGroup configGrp = config->group("Shutdown");
-    restart_lined->setUrl(configGrp.readEntry("RebootCmd", "/sbin/reboot"));
-    shutdown_lined->setUrl(configGrp.readEntry("HaltCmd", "/sbin/halt"));
+    restart_lined->setUrl(configGrp.readEntry("RebootCmd", "/sbin/shutdown -r now"));
+    shutdown_lined->setUrl(configGrp.readEntry("HaltCmd", "/sbin/shutdown -p now"));
 
     bm_combo->setCurrentId(configGrp.readEntry("BootManager", "None"));
 }
 
 void KDMSessionsWidget::defaults()
 {
-    restart_lined->setUrl(KUrl("/sbin/reboot"));
-    shutdown_lined->setUrl(KUrl("/sbin/halt"));
+    restart_lined->setUrl(KUrl("/sbin/shutdown -r now"));
+    shutdown_lined->setUrl(KUrl("/sbin/shutdown -p now"));
 
     sdlcombo->setCurrentIndex(SdAll);
     sdrcombo->setCurrentIndex(SdRoot);

signature.asc
Description: This is a digitally signed message part.

_______________________________________________
kde-freebsd mailing list
kde-freebsd@kde.org
https://mail.kde.org/mailman/listinfo/kde-freebsd
See also http://freebsd.kde.org/ for latest information