From ba2d271ed3de7d35168bf5d73a8857f2f047b9b6 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 25 May 2022 03:16:24 +0300 Subject: [PATCH] startkde: remove check for DESKTOP_LOCKED was set by KDM Signed-off-by: Ivailo Monev --- startkde.cmake | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/startkde.cmake b/startkde.cmake index 4334b642..54e7856e 100644 --- a/startkde.cmake +++ b/startkde.cmake @@ -105,31 +105,26 @@ EOF fi -dl=$DESKTOP_LOCKED -unset DESKTOP_LOCKED # Don't want it in the environment - ksplash_pid= -if test -z "$dl"; then - # languages as resolved by KLocale, for the splash screens use - # klocale_languages is assembled by kdostartupconfig4 calling KLocale - KLOCALE_LANGUAGES="$klocale_languages" - export KLOCALE_LANGUAGES - # the splashscreen and progress indicator - case "$ksplashrc_ksplash_engine" in +# languages as resolved by KLocale, for the splash screens use +# klocale_languages is assembled by kdostartupconfig4 calling KLocale +KLOCALE_LANGUAGES="$klocale_languages" +export KLOCALE_LANGUAGES +# the splashscreen and progress indicator +case "$ksplashrc_ksplash_engine" in KSplashX) - ksplash_pid=`ksplashx "${ksplashrc_ksplash_theme}" --pid` - ;; + ksplash_pid=`ksplashx "${ksplashrc_ksplash_theme}" --pid` + ;; KSplashQML) - ksplash_pid=`ksplashqml "${ksplashrc_ksplash_theme}" --pid` - ;; + ksplash_pid=`ksplashqml "${ksplashrc_ksplash_theme}" --pid` + ;; None) - ;; + ;; *) - ;; - esac - # no longer needed in the environment - unset KLOCALE_LANGUAGES -fi + ;; +esac +# no longer needed in the environment +unset KLOCALE_LANGUAGES # Set the path for Qt plugins provided by KDE QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`kde4-config --path qtplugins`