Magellan Linux

Contents of /trunk/nxserver-freenx/patches/nxserver-freenx-0.6.1-connection-errors-xorg72.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 205 - (show annotations) (download)
Mon May 21 15:08:07 2007 UTC (16 years, 11 months ago) by niro
File size: 1139 byte(s)
-fixes connection errors with xorg-7.2

1 --- freenx-0.6.0/nxnode 2007-05-21 14:19:57.000000000 +0200
2 +++ freenx-0.6.0/nxnode.fixed 2007-05-21 17:04:54.000000000 +0200
3 @@ -300,7 +300,7 @@
4
5 if [ "$virtualdesktop" = "1" -a "$type" = "unix-application" -a "$DEFAULT_X_WM" != "" -a -x "$(find_app $DEFAULT_X_WM)" ]
6 then
7 - DISPLAY=unix:$display $DEFAULT_X_WM >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1 &
8 + DISPLAY=localhost:$display $DEFAULT_X_WM >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1 &
9 NODE_WM_PID=$!
10 fi
11
12 @@ -308,7 +308,7 @@
13 # Startup the application
14 #
15
16 - DISPLAY=unix:$display $NODE_APPLICATION >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1 &
17 + DISPLAY=localhost:$display $NODE_APPLICATION >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1 &
18 NODE_APP_PID=$!
19
20 mkdir -p "$USER_FAKE_HOME/.nx/C-$sess_id/pids/"
21 @@ -1131,7 +1131,7 @@
22 then
23 sess_id="$SERVER_NAME-$display-$uniqueid"
24 # go into background immediately
25 - NXSESSIONID="$sess_id" DISPLAY=unix:$display "$NODE_AUTOSTART" "$1" >/dev/null 2>&1 &
26 + NXSESSIONID="$sess_id" DISPLAY=localhost:$display "$NODE_AUTOSTART" "$1" >/dev/null 2>&1 &
27 # dont't wait for this child!
28 disown $!
29 fi