2014-07-11 17:36:21 +00:00
|
|
|
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
|
2017-01-13 16:51:22 +00:00
|
|
|
index b7af60b..7ae5f1d 100644
|
2014-07-11 17:36:21 +00:00
|
|
|
--- a/startkde/startkde.cmake
|
|
|
|
|
+++ b/startkde/startkde.cmake
|
2017-01-13 16:51:22 +00:00
|
|
|
@@ -292,7 +292,7 @@ if test $? -ne 0; then
|
|
|
|
|
exit 1
|
2014-07-11 17:36:21 +00:00
|
|
|
fi
|
|
|
|
|
|
2017-01-13 16:51:22 +00:00
|
|
|
-qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
|
|
|
|
|
+qdbus-qt5 org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
|
2014-07-11 17:36:21 +00:00
|
|
|
|
2017-01-13 16:51:22 +00:00
|
|
|
# finally, give the session control to the session manager
|
|
|
|
|
# see kdebase/ksmserver for the description of the rest of the startup sequence
|
|
|
|
|
@@ -325,13 +325,13 @@ if test x"$wait_drkonqi"x = x"true"x ; then
|
|
|
|
|
# wait for remaining drkonqi instances with timeout (in seconds)
|
|
|
|
|
wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
|
|
|
|
|
wait_drkonqi_counter=0
|
|
|
|
|
- while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
|
|
|
|
|
+ while qdbus-qt5 | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
|
|
|
|
|
sleep 5
|
|
|
|
|
wait_drkonqi_counter=$((wait_drkonqi_counter+5))
|
|
|
|
|
if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
|
|
|
|
|
# ask remaining drkonqis to die in a graceful way
|
|
|
|
|
- qdbus | grep 'org.kde.drkonqi-' | while read address ; do
|
|
|
|
|
- qdbus "$address" "/MainApplication" "quit"
|
|
|
|
|
+ qdbus-qt5 | grep 'org.kde.drkonqi-' | while read address ; do
|
|
|
|
|
+ qdbus-qt5 "$address" "/MainApplication" "quit"
|
|
|
|
|
done
|
|
|
|
|
break
|
|
|
|
|
fi
|
