Contents of /trunk/xfce-utils/patches/xfce-utils-4.8.2-nx-no-screensaver.patch
Parent Directory | Revision Log
Revision 1408 -
(show annotations)
(download)
Tue Jul 12 18:24:22 2011 UTC (13 years, 2 months ago) by niro
File size: 1582 byte(s)
Tue Jul 12 18:24:22 2011 UTC (13 years, 2 months ago) by niro
File size: 1582 byte(s)
rediffed patch against 4.8.2
1 | diff -Naur xfce-utils-4.8.2/scripts/xinitrc.in xfce-utils-4.8.2-magellan/scripts/xinitrc.in |
2 | --- xfce-utils-4.8.2/scripts/xinitrc.in 2011-06-18 08:06:05.000000000 +0200 |
3 | +++ xfce-utils-4.8.2-magellan/scripts/xinitrc.in 2011-07-12 22:29:18.000000000 +0200 |
4 | @@ -185,7 +185,7 @@ |
5 | # launch a screensaver if enabled. do not launch if we're root or if |
6 | # we're in a VNC session. |
7 | screensaver_enabled=`xfconf-query -c xfce4-session -p /startup/screensaver/enabled 2> /dev/null` |
8 | -if test $UID -gt 0 -a -z "$VNCSESSION" -a "$screensaver_enabled" != "false"; then |
9 | +if test $UID -gt 0 -a -z "$VNCSESSION" -a -z "$NX_SYSTEM" -a "$screensaver_enabled" != "false"; then |
10 | screensaver_type=`xfconf-query -c xfce4-session -p /startup/screensaver/type 2> /dev/null` |
11 | |
12 | case "$screensaver_type" in |
13 | diff -Naur xfce-utils-4.8.2/scripts/xinitrc.in.in xfce-utils-4.8.2-magellan/scripts/xinitrc.in.in |
14 | --- xfce-utils-4.8.2/scripts/xinitrc.in.in 2011-06-18 08:05:25.000000000 +0200 |
15 | +++ xfce-utils-4.8.2-magellan/scripts/xinitrc.in.in 2011-07-12 22:29:48.000000000 +0200 |
16 | @@ -185,7 +185,7 @@ |
17 | # launch a screensaver if enabled. do not launch if we're root or if |
18 | # we're in a VNC session. |
19 | screensaver_enabled=`xfconf-query -c xfce4-session -p /startup/screensaver/enabled 2> /dev/null` |
20 | -if test $UID -gt 0 -a -z "$VNCSESSION" -a "$screensaver_enabled" != "false"; then |
21 | +if test $UID -gt 0 -a -z "$VNCSESSION" -a -z "$NX_SYSTEM" -a "$screensaver_enabled" != "false"; then |
22 | screensaver_type=`xfconf-query -c xfce4-session -p /startup/screensaver/type 2> /dev/null` |
23 | |
24 | case "$screensaver_type" in |