summaryrefslogtreecommitdiff
path: root/data/Xsession.in
diff options
context:
space:
mode:
authorMartin Pitt <martin.pitt@canonical.com>2009-07-17 16:13:19 -0400
committerRay Strode <rstrode@redhat.com>2009-07-17 16:13:19 -0400
commit22590328fab9aacf17d4ce32e1c0678c330b26c0 (patch)
tree31655664d3156844f928689b2a8d824dca5d4ed6 /data/Xsession.in
parentae1eef783ecc1aa7cfaa902d2804d91003ccd85b (diff)
downloadgdm-22590328fab9aacf17d4ce32e1c0678c330b26c0.tar.gz
Don't invoke cpp with xrdb
In order to improve startup speed, call xrdb with -nocpp. cpp is a pretty heavy beast, and the number of users which have preprocessor directives in their ~/.Xresources is probably a single digit (as is the number of users who still use ~/.Xresources with GNOME in the first place).
Diffstat (limited to 'data/Xsession.in')
-rwxr-xr-xdata/Xsession.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/Xsession.in b/data/Xsession.in
index 0ae3b311..d9720566 100755
--- a/data/Xsession.in
+++ b/data/Xsession.in
@@ -94,15 +94,15 @@ rh6sysmodmap=/etc/X11/xinit/Xmodmap
# merge in defaults
if [ -f "$rh6sysresources" ]; then
- xrdb -merge "$rh6sysresources"
+ xrdb -nocpp -merge "$rh6sysresources"
fi
if [ -f "$sysresources" ]; then
- xrdb -merge "$sysresources"
+ xrdb -nocpp -merge "$sysresources"
fi
if [ -f "$userresources" ]; then
- xrdb -merge "$userresources"
+ xrdb -nocpp -merge "$userresources"
fi
# merge in keymaps