aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin/winprefs.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-02-14 13:47:55 +0000
committermarha <marha@users.sourceforge.net>2010-02-14 13:47:55 +0000
commit8d38172d866775594af3185ae3fbd8d750677650 (patch)
tree2514d176474cc8adf7911a57724cc681c1359b47 /xorg-server/hw/xwin/winprefs.c
parent26f62ef5ccd04fa3a55632d808ca6e1061cfb983 (diff)
downloadvcxsrv-8d38172d866775594af3185ae3fbd8d750677650.tar.gz
vcxsrv-8d38172d866775594af3185ae3fbd8d750677650.tar.bz2
vcxsrv-8d38172d866775594af3185ae3fbd8d750677650.zip
Updated to xorg-server-1.7.99.901
Diffstat (limited to 'xorg-server/hw/xwin/winprefs.c')
-rw-r--r--xorg-server/hw/xwin/winprefs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/hw/xwin/winprefs.c b/xorg-server/hw/xwin/winprefs.c
index d5bceb928..93901cac7 100644
--- a/xorg-server/hw/xwin/winprefs.c
+++ b/xorg-server/hw/xwin/winprefs.c
@@ -723,7 +723,7 @@ winIconIsOverride(unsigned hiconIn)
/*
- * Try and open ~/.XWinrc and /usr/X11R6/lib/X11/system.XWinrc
+ * Try and open ~/.XWinrc and system.XWinrc
* Load it into prefs structure for use by other functions
*/
void
@@ -763,7 +763,7 @@ LoadPreferences (void)
#ifdef RELOCATE_PROJECTROOT
snprintf(buffer, sizeof(buffer), "%s\\system.XWinrc", winGetBaseDir());
#else
- strncpy(buffer, PROJECTROOT"/lib/X11/system.XWinrc", sizeof(buffer));
+ strncpy(buffer, SYSCONFDIR"/X11/system.XWinrc", sizeof(buffer));
#endif
buffer[sizeof(buffer)-1] = 0;
prefFile = fopen (buffer, "r");