frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XQuartz: Simplify the xquartz_resetenv_display path 

(cherry picked from commit d2e0624dd30eb234bb25595ceedfa51d48ca1724)
This commit is contained in:
Jeremy Huddleston 2008-11-25 11:25:58 -08:00
parent 94df1ab7f0
commit eb474adf98
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/xquartz/X11Controller.m
View File

@ -321,16 +321,6 @@ BOOL xquartz_resetenv_display = NO;
int child1, child2 = 0; int child1, child2 = 0;
int status; int status;
if(xquartz_resetenv_display) {
char _display[32];
size_t i;
for(i=0; !display && i < 5; i++)
sleep(1);
snprintf(_display, sizeof(_display), ":%s", display);
setenv("DISPLAY", _display, TRUE);
}
argv[0] = "/usr/bin/login"; argv[0] = "/usr/bin/login";
argv[1] = "-fp"; argv[1] = "-fp";
argv[2] = getlogin(); argv[2] = getlogin();
@ -368,7 +358,7 @@ BOOL xquartz_resetenv_display = NO;
/* Setup environment */ /* Setup environment */
temp = getenv("DISPLAY"); temp = getenv("DISPLAY");
if (temp == NULL || temp[0] == 0) { if (xquartz_resetenv_display || temp == NULL || temp[0] == 0) {
snprintf(buf, sizeof(buf), ":%s", display); snprintf(buf, sizeof(buf), ":%s", display);
setenv("DISPLAY", buf, TRUE); setenv("DISPLAY", buf, TRUE);
} }