Magellan Linux

Annotation of /trunk/xfce-utils/patches/xfce-utils-4.6.2-nx-no-screensaver.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1168 - (hide annotations) (download)
Thu Oct 7 14:18:22 2010 UTC (13 years, 7 months ago) by niro
File size: 1350 byte(s)
do not start a screensaver in a nx session
1 niro 1168 diff -Naur xfce-utils-4.6.2/scripts/xinitrc.in xfce-utils-4.6.2-magellan/scripts/xinitrc.in
2     --- xfce-utils-4.6.2/scripts/xinitrc.in 2010-05-21 18:56:36.000000000 +0200
3     +++ xfce-utils-4.6.2-magellan/scripts/xinitrc.in 2010-10-07 16:23:42.000000000 +0200
4     @@ -100,7 +100,7 @@
5     test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
6    
7     # Launch xscreensaver (if available), but only as non-root user
8     -if test $UID -gt 0 -a -z "$VNCSESSION"; then
9     +if test $UID -gt 0 -a -z "$VNCSESSION" -a -z "$NX_SYSTEM"; then
10     if test x"`which xscreensaver 2>/dev/null`" != x""; then
11     xscreensaver -no-splash &
12     elif test x"`which gnome-screensaver 2>/dev/null`" != x""; then
13     diff -Naur xfce-utils-4.6.2/scripts/xinitrc.in.in xfce-utils-4.6.2-magellan/scripts/xinitrc.in.in
14     --- xfce-utils-4.6.2/scripts/xinitrc.in.in 2010-05-21 18:56:26.000000000 +0200
15     +++ xfce-utils-4.6.2-magellan/scripts/xinitrc.in.in 2010-10-07 16:24:03.000000000 +0200
16     @@ -100,7 +100,7 @@
17     test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap
18    
19     # Launch xscreensaver (if available), but only as non-root user
20     -if test $UID -gt 0 -a -z "$VNCSESSION"; then
21     +if test $UID -gt 0 -a -z "$VNCSESSION" -a -z "$NX_SYSTEM"; then
22     if test x"`which xscreensaver 2>/dev/null`" != x""; then
23     xscreensaver -no-splash &
24     elif test x"`which gnome-screensaver 2>/dev/null`" != x""; then