[PC-BSD Commits] r2832 - in pcbsd: branches/7.0/system-overlay/PCBSD/bin branches/7.0/system-overlay/usr/local/kde4/share/applications/kde4 trunk/system-overlay/PCBSD/bin trunk/system-overlay/usr/local/kde4/share/applications/kde4

[svn at pcbsd.org]

Author: kris
Date: 2008-09-30 09:43:40 -0700 (Tue, 30 Sep 2008)
New Revision: 2832

Added:
   pcbsd/branches/7.0/system-overlay/usr/local/kde4/share/applications/kde4/pcbsdxsetup.desktop
   pcbsd/trunk/system-overlay/usr/local/kde4/share/applications/kde4/pcbsdxsetup.desktop
Modified:
   pcbsd/branches/7.0/system-overlay/PCBSD/bin/rerunXsetup.sh
   pcbsd/trunk/system-overlay/PCBSD/bin/rerunXsetup.sh
Log:

Added a new kmenu -> System -> Display Setup Wizard entry, which allows the user to 
re-run the X Setup GUI again without rebooting. 



Modified: pcbsd/branches/7.0/system-overlay/PCBSD/bin/rerunXsetup.sh
===================================================================
--- pcbsd/branches/7.0/system-overlay/PCBSD/bin/rerunXsetup.sh	2008-09-30 15:57:27 UTC (rev 2831)
+++ pcbsd/branches/7.0/system-overlay/PCBSD/bin/rerunXsetup.sh	2008-09-30 16:43:40 UTC (rev 2832)
@@ -4,11 +4,13 @@
 if [ "$?" = "0" ]
 then
 
-echo "touch /PCBSD/conf/.runxsetup
-(dcop --all-sessions --user `whoami` ksmserver default logout 0 -1 -1 ; killall -9 kdm-bin kdm ; sleep 1 ; killall -9 X ) &" > /tmp/.killx
+echo "
+touch /PCBSD/conf/.runxsetup
+(sleep 5; killall -9 kdm-bin kdm kdeinit4 X) &" > /tmp/.killx
 chmod 755 /tmp/.killx
 
 kdesu -c /tmp/.killx -n -d
+qdbus org.kde.ksmserver /KSMServer org.kde.KSMServerInterface.logout 0 -1 -1
 
 fi
 

Modified: pcbsd/trunk/system-overlay/PCBSD/bin/rerunXsetup.sh
===================================================================
--- pcbsd/trunk/system-overlay/PCBSD/bin/rerunXsetup.sh	2008-09-30 15:57:27 UTC (rev 2831)
+++ pcbsd/trunk/system-overlay/PCBSD/bin/rerunXsetup.sh	2008-09-30 16:43:40 UTC (rev 2832)
@@ -4,11 +4,13 @@
 if [ "$?" = "0" ]
 then
 
-echo "touch /PCBSD/conf/.runxsetup
-(dcop --all-sessions --user `whoami` ksmserver default logout 0 -1 -1 ; killall -9 kdm-bin kdm ; sleep 1 ; killall -9 X ) &" > /tmp/.killx
+echo "
+touch /PCBSD/conf/.runxsetup
+(sleep 5; killall -9 kdm-bin kdm kdeinit4 X) &" > /tmp/.killx
 chmod 755 /tmp/.killx
 
 kdesu -c /tmp/.killx -n -d
+qdbus org.kde.ksmserver /KSMServer org.kde.KSMServerInterface.logout 0 -1 -1
 
 fi