summaryrefslogtreecommitdiffstats
path: root/starttde
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2014-02-25 13:01:26 -0600
committerDarrell Anderson <humanreadable@yahoo.com>2014-02-25 13:01:26 -0600
commitc3648c55694c216fc4064917962fc8e88a0bf51c (patch)
tree2e6468206b0e1e080da23196a3f3a4935ff25b94 /starttde
parenta8d432483204f80e11c83ea9dbc311882d9289d8 (diff)
downloadtdebase-c3648c55694c216fc4064917962fc8e88a0bf51c.tar.gz
tdebase-c3648c55694c216fc4064917962fc8e88a0bf51c.zip
Reverted commit 77aed4a4.
Diffstat (limited to 'starttde')
-rw-r--r--starttde16
1 files changed, 0 insertions, 16 deletions
diff --git a/starttde b/starttde
index 2308f6f9..269d4ffa 100644
--- a/starttde
+++ b/starttde
@@ -405,17 +405,6 @@ fi
dl=$DESKTOP_LOCKED
unset DESKTOP_LOCKED # Don't want it in the environment
-# Clean house in case a previous session was terminated abruptly.
-# When left hanging these two processes interfere with starting Trinity.
-DESKTOP_LOCK="`ps aux | grep $USER | grep kdesktop_lock | grep -v grep | awk '{print $2}'`"
-if [ "$DESKTOP_LOCK" != "" ]; then
- kill -9 $DESKTOP_LOCK &>/dev/null
-fi
-DCOP="`ps aux | grep $USER | grep dcopserver | grep -v grep | awk '{print $2}'`"
-if [ "$DCOP" != "" ]; then
- kill -9 $DCOP &>/dev/null
-fi
-
# Launch splash that doesn't need any TDE libraries here, before
# TDE libraries are loaded into memory (which may take some time
# with cold caches). Makes the splash appear sooner.
@@ -751,11 +740,6 @@ echo "[starttde] Shutting down Trinity..." 1>&2
$TDEDIR/bin/tdeinit_shutdown
$TDEDIR/bin/dcopserver_shutdown --wait
$TDEDIR/bin/artsshell -q terminate
-# Sometimes gamin prevents halting or rebooting a system. Just terminate the process now.
-GAM_SERVER="`ps aux | grep $USER | grep gam_server | grep -v grep | awk '{print $2}'`"
-if [ "$GAM_SERVER" != "" ]; then
- kill -9 $GAM_SERVER 2>/dev/null
-fi
# KDE4 support.
if [ -f /usr/bin/kdeinit4_shutdown ]; then
/usr/bin/kde4 kdeinit4_shutdown 2>/dev/null