Attachment 1283 Details for Bug 1826 – [FIXED_X11R68x] patch

[patch] [FIXED_X11R68x] patch

xorgconf.diff (text/plain), 1.09 KB, created by Matthieu Herrb on 2004-11-11 07:17:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthieu Herrb

Created: 2004-11-11 07:17:17 UTC

Size: 1.09 KB

patch

obsolete

>Index: programs/Xserver/hw/xfree86/xf86cfg/interface.c
>===================================================================
>RCS file: /cvs/fd/xorg/xc/programs/Xserver/hw/xfree86/xf86cfg/interface.c,v
>retrieving revision 1.2
>diff -u -r1.2 interface.c
>--- programs/Xserver/hw/xfree86/xf86cfg/interface.c	23 Apr 2004 19:54:18 -0000	1.2
>+++ programs/Xserver/hw/xfree86/xf86cfg/interface.c	17 Oct 2004 09:30:03 -0000
>@@ -300,7 +300,7 @@
>     
>     startedx = startx();
>     if (XF86Config_path == NULL)
>-	XF86Config_path = XtNewString(__XCONFIGFILE__"-4");
>+	XF86Config_path = XtNewString(__XCONFIGFILE__);
>     if (XkbConfig_path == NULL) {
> 	XmuSnprintf(XkbConfig_path_static, sizeof(XkbConfig_path_static),
> 		    "%s/%s%s", XFree86Dir, XkbConfigDir, XkbConfigFile);
>@@ -536,9 +536,9 @@
> # endif
> #else
> # ifdef XF86CONFIGDIR
>-	XF86Config_path = XtNewString(XF86CONFIGDIR "/"__XCONFIGFILE__"-4");
>+	XF86Config_path = XtNewString(XF86CONFIGDIR "/"__XCONFIGFILE__);
> # else
>-	XF86Config_path = XtNewString("/etc/X11/"__XCONFIGFILE__"-4");
>+	XF86Config_path = XtNewString("/etc/X11/"__XCONFIGFILE__);
> # endif
> #endif
>     }

Flags:

roland.mainz: 6.8-branch+

Actions: View | Splinter Review

Attachments on bug 1826: 1283

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.