From 97da788155e07fb8b7f95be658e29810610d3585 Mon Sep 17 00:00:00 2001 From: Sanel Zukan Date: Thu, 20 Dec 2012 12:32:44 +0000 Subject: [PATCH] Fixing #211: startede refers to old X11R6 resource path. In startede sysresources are refering to older X11R6 (now is X11R7). Also as reported, on some systems the path '/usr/X11' is used too. Solving by removing resource usage at all; not seeing any usefulness of it... --- data/startede.in | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/data/startede.in b/data/startede.in index 0c45ef2..8386c4c 100644 --- a/data/startede.in +++ b/data/startede.in @@ -3,7 +3,7 @@ # $Id$ # # Part of Equinox Desktop Environment (EDE). -# Copyright (c) 2007-2009 EDE Authors. +# Copyright (c) 2007-2012 EDE Authors. # # This program is licensed under terms of the # GNU General Public License version 2 or newer. @@ -55,21 +55,9 @@ export XDG_MENU_PREFIX PATH=$PATH:$PREFIX:$PREFIX/bin export PATH -userresources=$HOME/.Xdefaults -sysresources=/usr/X11R6/lib/X11/xinit/.Xresources - -if [ -f $sysresources ]; then - xrdb -merge $sysresources -fi - -if [ -f $userresources ]; then - xrdb -merge $userresources -fi - -# set background inside X -XSETROOT=`which xsetroot 2> /dev/null` -if [ "$XSETROOT" ]; then - $XSETROOT -solid black +# set the background color inside X +if command -v xsetroot > /dev/null 2>&1; then + xsetroot -solid black fi # remove leftovers if evoke crashed