From d5a674d26d1b4ed377fe98c403f77f3f21bbb473 Mon Sep 17 00:00:00 2001
From: Lee Chang Yeon <cyeon.lee@samsung.com>
Date: Tue, 8 Apr 2014 19:25:34 +0900
Subject: Imported Upstream version 1.3.3

---
 startx.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'startx.cpp')

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
 
-- 
cgit v1.2.3