Attachment 495 Details for Bug 893 – Patch for 2004-07-19-trunk

[patch] Patch for 2004-07-19-trunk

patch.gudiff (text/plain), 3.00 KB, created by Roland Mainz on 2004-07-19 15:00:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2004-07-19 15:00:26 UTC

Size: 3.00 KB

patch

obsolete

>Index: xc/ChangeLog
>===================================================================
>RCS file: /cvs/xorg/xc/ChangeLog,v
>retrieving revision 1.100
>diff -u -2 -0 -r1.100 ChangeLog
>--- xc/ChangeLog	19 Jul 2004 21:07:32 -0000	1.100
>+++ xc/ChangeLog	19 Jul 2004 21:54:53 -0000
>@@ -1,21 +1,26 @@
> 2004-07-19 Roland Mainz <roland.mainz@nrubsig.org>
>+        * xc/programs/Xserver/Xprint/attributes.c
>+        Bugzilla #893: Fixing the bug that Xprt did not honor ${LC_ALL}
>+        when looking for model-config dirs.
>+
>+2004-07-19 Roland Mainz <roland.mainz@nrubsig.org>
>         * xc/config/cf/X11.tmpl
>         * xc/doc/hardcopy/Imakefile
>         * xc/doc/hardcopy/XPRINT/Imakefile
>         Bugzilla #891: Fixing some installation problems with hardcopy
>         dirs.
>         
> 2004-07-18  Rik Faith  <faith(at)freedesktop.org>
> 
> 	* programs/Xserver/hw/dmx/dmxextension.c:
> 	(dmxAdjustCursorBoundaries):
> 	Addition of console input after removal of core backend input that
> 	is not on screen 0 can cause a segfault.  Fix by preventing
> 	reinitialization of detached inputs.
> 	* programs/Xserver/hw/dmx/dmxgcops.c: (dmxFindAlternatePixmap),
> 	(dmxGetImage):
> 	When Xinerama is active and screen 0 is detached, pixmaps for
> 	XGetImage must be obtained from another screen.
> 	
> 2004-07-18 Roland Mainz <roland.mainz@nrubsig.org>
> 	* xc/programs/Xserver/Xprint/ps/Ps.h
>Index: xc/programs/Xserver/Xprint/attributes.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/attributes.c,v
>retrieving revision 1.4
>diff -u -2 -0 -r1.4 attributes.c
>--- xc/programs/Xserver/Xprint/attributes.c	22 Jun 2004 10:18:13 -0000	1.4
>+++ xc/programs/Xserver/Xprint/attributes.c	19 Jul 2004 21:55:16 -0000
>@@ -154,41 +154,46 @@
> 
>     return configDir;
> }
> 
> /*
>  * XpGetConfigDir returns a string containing the path name of the print
>  * server configuration directory.  If the useLocale parameter is False
>  * the it returns the path to the "/C" directory.  If the useLocale
>  * parameter is True it returns the path to the directory associated with
>  * $LANG.  It makes no attempt to ensure that the directory actually exists.
>  */
> char *
> XpGetConfigDir(Bool useLocale)
> { 
>     char *dirName, *langName, *langDir, *configDir;
>     Bool freeLangDir = False;
> 
>     if(useLocale == False) langDir = "/C";
>     else 
>     {
>-	if((langName = getenv("LANG")) == (char *)NULL)
>+        langName = getenv("LC_ALL");
>+        if (langName == NULL) {
>+            langName = getenv("LANG");
>+        }
>+        
>+	if(langName == (char *)NULL)
> 	    return (char *)NULL;
> 	else
> 	{
> 	    if(strcmp(langName, "C") == 0)
> 		return (char *)NULL;
> 	    langDir = (char *)xalloc(strlen(langName) + 2);
> 	    sprintf(langDir, "/%s", langName);
> 	    freeLangDir = True;
> 	}
>     }
>     
>     configDir = XpGetConfigDirBase();
> 
>     dirName = (char *)xalloc(strlen(configDir) + strlen(XPDIR) + 
> 			      strlen(langDir) + 1);
>     sprintf(dirName, "%s%s%s", configDir, langDir, XPDIR);
> 
>     if(freeLangDir == True)
> 	xfree(langDir);
>

Actions: View | Splinter Review

Attachments on bug 893: 495

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.