summaryrefslogtreecommitdiff
path: root/startx.cpp
diff options
context:
space:
mode:
authorLee Chang Yeon <cyeon.lee@samsung.com>2014-04-08 19:25:34 +0900
committerLee Chang Yeon <cyeon.lee@samsung.com>2014-04-08 19:25:34 +0900
commitd5a674d26d1b4ed377fe98c403f77f3f21bbb473 (patch)
treebf5b9e185e8663c28bbe614ff72f96ad3119e4da /startx.cpp
parent1d888804982d06910f10c1b6a9b29e7b9a23f550 (diff)
downloadxinit-d5a674d26d1b4ed377fe98c403f77f3f21bbb473.tar.gz
xinit-d5a674d26d1b4ed377fe98c403f77f3f21bbb473.tar.bz2
xinit-d5a674d26d1b4ed377fe98c403f77f3f21bbb473.zip
Imported Upstream version 1.3.3upstream/1.3.3upstream
Diffstat (limited to 'startx.cpp')
-rw-r--r--startx.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/startx.cpp b/startx.cpp
index c92c51c..c595b84 100644
--- a/startx.cpp
+++ b/startx.cpp
@@ -126,7 +126,9 @@ if [ x`defaults read $X11_PREFS_DOMAIN nolisten_tcp` = x1 ] ; then
defaultserverargs="$defaultserverargs -nolisten tcp"
fi
-if defaults read $X11_PREFS_DOMAIN dpi > /dev/null 2>&1 ; then
+XCOMM The second check is the real one. The first is to hopefully avoid
+XCOMM needless syslog spamming.
+if defaults read $X11_PREFS_DOMAIN 2> /dev/null | grep -q 'dpi' && defaults read $X11_PREFS_DOMAIN dpi > /dev/null 2>&1 ; then
defaultserverargs="$defaultserverargs -dpi `defaults read $X11_PREFS_DOMAIN dpi`"
fi