mirror of
https://bitbucket.org/smil3y/kde-workspace.git
synced 2025-02-23 18:32:50 +00:00
startkde: remove check for DESKTOP_LOCKED
was set by KDM Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
fc19281f94
commit
ba2d271ed3
1 changed files with 15 additions and 20 deletions
|
@ -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`
|
||||
|
|
Loading…
Add table
Reference in a new issue