1 diff -ur tigervnc-1.3.0.orig/unix/vncserver tigervnc-1.3.0/unix/vncserver
2 --- tigervnc-1.3.0.orig/unix/vncserver 2013-07-18 16:37:54.000000000 +0000
3 +++ tigervnc-1.3.0/unix/vncserver 2013-07-21 21:01:17.590116481 +0000
8 - "unset SESSION_MANAGER\n".
9 - "unset DBUS_SESSION_BUS_ADDRESS\n".
11 - "if [ \$OS = 'Linux' ]; then\n".
12 - " case \"\$WINDOWMANAGER\" in\n".
14 - " if [ -e /etc/SuSE-release ]; then\n".
15 - " PATH=\$PATH:/opt/gnome/bin\n".
21 - "if [ -x /etc/X11/xinit/xinitrc ]; then\n".
22 - " exec /etc/X11/xinit/xinitrc\n".
24 - "if [ -f /etc/X11/xinit/xinitrc ]; then\n".
25 - " exec sh /etc/X11/xinit/xinitrc\n".
27 - "[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n".
28 + "# Uncomment the following two lines for normal desktop:\n\n".
29 + "# unset SESSION_MANAGER\n".
30 + "# exec /etc/X11/xinit/xinitrc\n\n".
31 + "[ -x /etc/vnc/xstartup ] && exec /etc/vnc/xstartup\n".
32 + "[ -r $HOME/.Xresources ] && xrdb $HOME/.Xresources\n\n".
33 "xsetroot -solid grey\n".
34 + "vncconfig -iconic &\n".
35 "xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n".
40 $ENV{VNCDESKTOP}= $desktopName;
42 -system($exedir."vncconfig -iconic >> " . "edString($desktopLog) . " 2>&1 &");
45 system("$vncUserDir/xstartup >> " . "edString($desktopLog) . " 2>&1");
46 if (kill 0, `cat $pidFile`) {