Magellan Linux

Contents of /trunk/mcore-tools/mcore-tools-1.0.1-fix-control-server-logic-of_push_config_80_screensaver_dpms.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 3375 - (show annotations) (download)
Fri Jul 26 12:40:58 2019 UTC (4 years, 9 months ago) by niro
File size: 1242 byte(s)
-added upstrean patch
1 ------------------------------------------------------------------------
2 r2855 | niro | 2019-07-26 14:38:54 +0200 (Fr, 26. Jul 2019) | 1 Zeile
3
4 -fixed control server logic of push_config_80_screensaver_dpms(), submit the values 0|1 not disable|enable
5
6 Index: src/modules/xscreensaver/screensaver.control.class.in
7 ===================================================================
8 --- src/modules/xscreensaver/screensaver.control.class.in (Revision 2854)
9 +++ src/modules/xscreensaver/screensaver.control.class.in (Revision 2855)
10 @@ -46,7 +46,6 @@
11 {
12 local serial="$1"
13 local value
14 - local action
15
16 value=$(mysqldo "select dpms from cfg_screensaver where serial='${serial}'")
17 if [[ -z ${value} ]] || [[ ${value} = NULL ]]
18 @@ -54,8 +53,7 @@
19 decho "retval NULL, not running 'control_client '${serial}' set screensaver.dpms '${value}''"
20 else
21 case "${value}" in
22 - 0) action="disable" ;;
23 - 1) action="enable" ;;
24 + 0|1) ;;
25 *)
26 decho "Unknown value '${value}'"
27 return 1
28 @@ -62,7 +60,7 @@
29 ;;
30 esac
31
32 - control_client "${serial}" set screensaver.dpms "${action}"
33 + control_client "${serial}" set screensaver.dpms "${value}"
34 fi
35 }
36
37
38 ------------------------------------------------------------------------