Changeset View
Changeset View
Standalone View
Standalone View
startkde/startplasma.cmake
Show First 20 Lines • Show All 157 Lines • ▼ Show 20 Line(s) | |||||
158 | kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS | 158 | kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS | ||
159 | if test $? -eq 255; then | 159 | if test $? -eq 255; then | ||
160 | # Startup error | 160 | # Startup error | ||
161 | echo 'startplasma: Could not start ksmserver. Check your installation.' 1>&2 | 161 | echo 'startplasma: Could not start ksmserver. Check your installation.' 1>&2 | ||
162 | test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null | 162 | test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null | ||
163 | xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." | 163 | xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." | ||
164 | fi | 164 | fi | ||
165 | 165 | | |||
166 | #Anything after here is logout | ||||
167 | #It is not called after shutdown/restart | ||||
168 | | ||||
166 | wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` | 169 | wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` | ||
167 | 170 | | |||
168 | if test x"$wait_drkonqi"x = x"true"x ; then | 171 | if test x"$wait_drkonqi"x = x"true"x ; then | ||
169 | # wait for remaining drkonqi instances with timeout (in seconds) | 172 | # wait for remaining drkonqi instances with timeout (in seconds) | ||
170 | wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` | 173 | wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` | ||
171 | wait_drkonqi_counter=0 | 174 | wait_drkonqi_counter=0 | ||
172 | while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do | 175 | while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do | ||
173 | sleep 5 | 176 | sleep 5 | ||
Show All 25 Lines |