diff options
| author | marha <marha@users.sourceforge.net> | 2009-11-20 13:01:45 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-11-20 13:01:45 +0000 |
| commit | d2d9977f1153b5222b34859a2cb22b957bfe3221 (patch) | |
| tree | a732c0c90bbd06bbf003e23a3ec08300e154a51d /xorg-server/hw/xwin/winprefs.c | |
| parent | da051c6af428703e746c6a1677e1dce032b86c41 (diff) | |
| download | vcxsrv-d2d9977f1153b5222b34859a2cb22b957bfe3221.tar.gz vcxsrv-d2d9977f1153b5222b34859a2cb22b957bfe3221.tar.bz2 vcxsrv-d2d9977f1153b5222b34859a2cb22b957bfe3221.zip | |
Native glx is compiling and running now (although no acceleration is happening... to be investigated further)
Diffstat (limited to 'xorg-server/hw/xwin/winprefs.c')
| -rw-r--r-- | xorg-server/hw/xwin/winprefs.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xorg-server/hw/xwin/winprefs.c b/xorg-server/hw/xwin/winprefs.c index 7059ffd6d..4333d5fd4 100644 --- a/xorg-server/hw/xwin/winprefs.c +++ b/xorg-server/hw/xwin/winprefs.c @@ -784,16 +784,15 @@ LoadPreferences (void) /* Setup a DISPLAY environment variable, need to allocate on heap */ /* because putenv doesn't copy the argument... */ - snprintf (szDisplay, 512, "DISPLAY=127.0.0.1:%s.0", display); - szEnvDisplay = (char *)(malloc (strlen(szDisplay)+1)); + winGetDisplayName(szDisplay, atoi(display)); + szEnvDisplay = (char *)(malloc(strlen(szDisplay)+strlen("DISPLAY=")+1)); if (szEnvDisplay) { - strcpy (szEnvDisplay, szDisplay); + snprintf(szEnvDisplay, 512, "DISPLAY=%s", szDisplay); putenv (szEnvDisplay); } /* Replace any "%display%" in menu commands with display string */ - snprintf (szDisplay, 512, "127.0.0.1:%s.0", display); for (i=0; i<pref.menuItems; i++) { for (j=0; j<pref.menu[i].menuItems; j++) |