|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
diff -up plasma-workspace-5.12.5/startkde/startkde.cmake.startkde plasma-workspace-5.12.5/startkde/startkde.cmake
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
--- plasma-workspace-5.12.5/startkde/startkde.cmake.startkde 2018-05-01 08:03:40.000000000 -0500
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
+++ plasma-workspace-5.12.5/startkde/startkde.cmake 2018-05-06 21:12:49.592504191 -0500
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
@@ -279,22 +237,21 @@ if test $? -ne 0; then
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
# Startup error
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
echo 'startkde: Could not sync environment to dbus.' 1>&2
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
- xmessage -geometry 500x100 "Could not sync environment to dbus."
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
+ xmessage "Could not sync environment to dbus."
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
exit 1
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
fi
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
-# We set LD_BIND_NOW to increase the efficiency of kdeinit.
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
-# kdeinit unsets this variable before loading applications.
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
-LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
+@CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
if test $? -ne 0; then
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
# Startup error
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
echo 'startkde: Could not start kdeinit5. Check your installation.' 1>&2
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
- xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
+ xmessage "Could not start kdeinit5. Check your installation."
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
exit 1
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
fi
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
-qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
+qdbus=qdbus-qt5
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
+$qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
# finally, give the session control to the session manager
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
# see kdebase/ksmserver for the description of the rest of the startup sequence
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
@@ -327,13 +284,13 @@ if test x"$wait_drkonqi"x = x"true"x ; t
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
# wait for remaining drkonqi instances with timeout (in seconds)
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
wait_drkonqi_counter=0
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
- while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
+ while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
sleep 5
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
wait_drkonqi_counter=$((wait_drkonqi_counter+5))
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
# ask remaining drkonqis to die in a graceful way
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
- qdbus | grep 'org.kde.drkonqi-' | while read address ; do
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
- qdbus "$address" "/MainApplication" "quit"
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
+ $qdbus | grep 'org.kde.drkonqi-' | while read address ; do
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
+ $qdbus "$address" "/MainApplication" "quit"
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
done
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
break
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
fi
|
|
![](https://seccdn.libravatar.org/avatar/082b19ca4e231b0f1c8cc127e76ebbc2c8d4915ed5e40f8dad503c31c9b743c6?s=16&d=retro) |
dae05ff |
diff -up plasma-workspace-5.12.5/startkde/startplasma.cmake.startkde plasma-workspace-5.12.5/startkde/startplasma.cmake
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
--- plasma-workspace-5.12.5/startkde/startplasma.cmake.startkde 2018-05-01 08:03:40.000000000 -0500
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
+++ plasma-workspace-5.12.5/startkde/startplasma.cmake 2018-05-06 21:11:54.749023404 -0500
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
@@ -140,7 +140,8 @@ if test $? -ne 0; then
|
|
![](https://seccdn.libravatar.org/avatar/082b19ca4e231b0f1c8cc127e76ebbc2c8d4915ed5e40f8dad503c31c9b743c6?s=16&d=retro) |
ab82197 |
exit 1
|
|
![](https://seccdn.libravatar.org/avatar/082b19ca4e231b0f1c8cc127e76ebbc2c8d4915ed5e40f8dad503c31c9b743c6?s=16&d=retro) |
ab82197 |
fi
|
|
![](https://seccdn.libravatar.org/avatar/082b19ca4e231b0f1c8cc127e76ebbc2c8d4915ed5e40f8dad503c31c9b743c6?s=16&d=retro) |
ab82197 |
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
28c2701 |
-qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
|
|
![](https://seccdn.libravatar.org/avatar/082b19ca4e231b0f1c8cc127e76ebbc2c8d4915ed5e40f8dad503c31c9b743c6?s=16&d=retro) |
ab82197 |
+qdbus=qdbus-qt5
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
28c2701 |
+$qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
|
|
![](https://seccdn.libravatar.org/avatar/082b19ca4e231b0f1c8cc127e76ebbc2c8d4915ed5e40f8dad503c31c9b743c6?s=16&d=retro) |
ab82197 |
|
|
![](https://seccdn.libravatar.org/avatar/082b19ca4e231b0f1c8cc127e76ebbc2c8d4915ed5e40f8dad503c31c9b743c6?s=16&d=retro) |
ab82197 |
# finally, give the session control to the session manager
|
|
![](https://seccdn.libravatar.org/avatar/082b19ca4e231b0f1c8cc127e76ebbc2c8d4915ed5e40f8dad503c31c9b743c6?s=16&d=retro) |
ab82197 |
# see kdebase/ksmserver for the description of the rest of the startup sequence
|
|
![](https://seccdn.libravatar.org/avatar/082b19ca4e231b0f1c8cc127e76ebbc2c8d4915ed5e40f8dad503c31c9b743c6?s=16&d=retro) |
dae05ff |
@@ -169,13 +170,13 @@ if test x"$wait_drkonqi"x = x"true"x ; t
|
|
![](https://seccdn.libravatar.org/avatar/082b19ca4e231b0f1c8cc127e76ebbc2c8d4915ed5e40f8dad503c31c9b743c6?s=16&d=retro) |
ab82197 |
# wait for remaining drkonqi instances with timeout (in seconds)
|
|
![](https://seccdn.libravatar.org/avatar/082b19ca4e231b0f1c8cc127e76ebbc2c8d4915ed5e40f8dad503c31c9b743c6?s=16&d=retro) |
ab82197 |
wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
|
|
![](https://seccdn.libravatar.org/avatar/082b19ca4e231b0f1c8cc127e76ebbc2c8d4915ed5e40f8dad503c31c9b743c6?s=16&d=retro) |
ab82197 |
wait_drkonqi_counter=0
|
|
![](https://seccdn.libravatar.org/avatar/082b19ca4e231b0f1c8cc127e76ebbc2c8d4915ed5e40f8dad503c31c9b743c6?s=16&d=retro) |
ab82197 |
- while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
|
|
![](https://seccdn.libravatar.org/avatar/082b19ca4e231b0f1c8cc127e76ebbc2c8d4915ed5e40f8dad503c31c9b743c6?s=16&d=retro) |
ab82197 |
+ while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
|
|
![](https://seccdn.libravatar.org/avatar/082b19ca4e231b0f1c8cc127e76ebbc2c8d4915ed5e40f8dad503c31c9b743c6?s=16&d=retro) |
ab82197 |
sleep 5
|
|
![](https://seccdn.libravatar.org/avatar/082b19ca4e231b0f1c8cc127e76ebbc2c8d4915ed5e40f8dad503c31c9b743c6?s=16&d=retro) |
ab82197 |
wait_drkonqi_counter=$((wait_drkonqi_counter+5))
|
|
![](https://seccdn.libravatar.org/avatar/082b19ca4e231b0f1c8cc127e76ebbc2c8d4915ed5e40f8dad503c31c9b743c6?s=16&d=retro) |
ab82197 |
if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
|
|
![](https://seccdn.libravatar.org/avatar/082b19ca4e231b0f1c8cc127e76ebbc2c8d4915ed5e40f8dad503c31c9b743c6?s=16&d=retro) |
ab82197 |
# ask remaining drkonqis to die in a graceful way
|
|
![](https://seccdn.libravatar.org/avatar/082b19ca4e231b0f1c8cc127e76ebbc2c8d4915ed5e40f8dad503c31c9b743c6?s=16&d=retro) |
ab82197 |
- qdbus | grep 'org.kde.drkonqi-' | while read address ; do
|
|
![](https://seccdn.libravatar.org/avatar/082b19ca4e231b0f1c8cc127e76ebbc2c8d4915ed5e40f8dad503c31c9b743c6?s=16&d=retro) |
ab82197 |
- qdbus "$address" "/MainApplication" "quit"
|
|
![](https://seccdn.libravatar.org/avatar/082b19ca4e231b0f1c8cc127e76ebbc2c8d4915ed5e40f8dad503c31c9b743c6?s=16&d=retro) |
ab82197 |
+ $qdbus | grep 'org.kde.drkonqi-' | while read address ; do
|
|
![](https://seccdn.libravatar.org/avatar/082b19ca4e231b0f1c8cc127e76ebbc2c8d4915ed5e40f8dad503c31c9b743c6?s=16&d=retro) |
ab82197 |
+ $qdbus "$address" "/MainApplication" "quit"
|
|
![](https://seccdn.libravatar.org/avatar/082b19ca4e231b0f1c8cc127e76ebbc2c8d4915ed5e40f8dad503c31c9b743c6?s=16&d=retro) |
ab82197 |
done
|
|
![](https://seccdn.libravatar.org/avatar/082b19ca4e231b0f1c8cc127e76ebbc2c8d4915ed5e40f8dad503c31c9b743c6?s=16&d=retro) |
ab82197 |
break
|
|
![](https://seccdn.libravatar.org/avatar/082b19ca4e231b0f1c8cc127e76ebbc2c8d4915ed5e40f8dad503c31c9b743c6?s=16&d=retro) |
ab82197 |
fi
|
|
![](https://seccdn.libravatar.org/avatar/082b19ca4e231b0f1c8cc127e76ebbc2c8d4915ed5e40f8dad503c31c9b743c6?s=16&d=retro) |
dae05ff |
diff -up plasma-workspace-5.12.5/startkde/startplasmacompositor.cmake.startkde plasma-workspace-5.12.5/startkde/startplasmacompositor.cmake
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
--- plasma-workspace-5.12.5/startkde/startplasmacompositor.cmake.startkde 2018-05-01 08:03:40.000000000 -0500
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
+++ plasma-workspace-5.12.5/startkde/startplasmacompositor.cmake 2018-05-06 21:11:54.749023404 -0500
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
@@ -3,6 +3,8 @@
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
# DEFAULT Plasma STARTUP SCRIPT ( @PROJECT_VERSION@ )
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
#
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
+qdbus=qdbus-qt5
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
+
|
|
![](https://seccdn.libravatar.org/avatar/082b19ca4e231b0f1c8cc127e76ebbc2c8d4915ed5e40f8dad503c31c9b743c6?s=16&d=retro) |
ab82197 |
# We need to create config folder so we can write startupconfigkeys
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
if [ ${XDG_CONFIG_HOME} ]; then
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
configDir=$XDG_CONFIG_HOME;
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
@@ -120,12 +122,12 @@ fi
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
# Get a property value from org.freedesktop.locale1
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
queryLocale1() {
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
- qdbus --system org.freedesktop.locale1 /org/freedesktop/locale1 "$1"
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
+ $qdbus --system org.freedesktop.locale1 /org/freedesktop/locale1 "$1"
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
}
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
# Query whether org.freedesktop.locale1 is available. If it is, try to
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
# set XKB_DEFAULT_{MODEL,LAYOUT,VARIANT,OPTIONS} accordingly.
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
-if qdbus --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
+if $qdbus --system org.freedesktop.locale1 >/dev/null 2>/dev/null; then
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
# Do not overwrite existing values. There is no point in setting only some
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
# of them as then they would not match anymore.
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
if [ -z "${XKB_DEFAULT_MODEL}" -a -z "${XKB_DEFAULT_LAYOUT}" -a \
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
@@ -175,7 +177,7 @@ fi
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
export XDG_DATA_DIRS
|
|
![](https://seccdn.libravatar.org/avatar/97f9b52cb221a63bbeec81d71d9abb8385ef453c5ae05057d2779b66aaf95d31?s=16&d=retro) |
cf80065 |
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
# Make sure that D-Bus is running
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
-if qdbus >/dev/null 2>/dev/null; then
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
+if $qdbus >/dev/null 2>/dev/null; then
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
: # ok
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
else
|
|
![](https://seccdn.libravatar.org/avatar/ded8b4074f10a75555113aa0f72bacc4a908bef2684bd0158218d287f2c59a99?s=16&d=retro) |
34dadcb |
echo 'startplasmacompositor: Could not start D-Bus. Can you call qdbus?' 1>&2
|