diff options
author | Changyeon Lee <cyeon.lee@samsung.com> | 2014-04-17 14:39:58 +0900 |
---|---|---|
committer | Changyeon Lee <cyeon.lee@samsung.com> | 2014-04-17 14:46:41 +0900 |
commit | ba6c5bef58d88aab1584107543b81a2930451a1f (patch) | |
tree | aa0e1ab02744850352e42ecbd629ad5a8f5c98d8 /startx.cpp | |
parent | d7fbb5c11b41bb71b9173daea2f48d855bc61316 (diff) | |
parent | 8d5e38de0819168970669f24379c21338616184e (diff) | |
download | xinit-accepted/tizen_tv.tar.gz xinit-accepted/tizen_tv.tar.bz2 xinit-accepted/tizen_tv.zip |
Merge branch 'devel/upgrade' into tizentizen_3.0.2014.q3_common_releasesubmit/tizen_mobile/20141120.000000submit/tizen/20140819.234625submit/tizen/20140818.144456submit/tizen/20140818.084211submit/tizen/20140417.073530submit/devel/x11/20140718.035926accepted/tizen/mobile/20140519.083048tizen_3.0.2015.q2_commontizen_3.0.2015.q1_commontizen_3.0.2014.q4_commontizen_3.0.2014.q3_commondevel/x11accepted/tizen_wearableaccepted/tizen_tvaccepted/tizen_mobileaccepted/tizen_commonaccepted/tizen_3.0.2014.q3_common
Change-Id: Ibe6f53547397a2beaf4747ef8a442b43e41544fb
Signed-off-by: Changyeon Lee <cyeon.lee@samsung.com>
Diffstat (limited to 'startx.cpp')
-rw-r--r-- | startx.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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 |