diff options
author | Rex Dieter <rdieter@math.unl.edu> | 2015-01-15 10:09:43 -0600 |
---|---|---|
committer | Rex Dieter <rdieter@math.unl.edu> | 2015-01-15 10:09:43 -0600 |
commit | 8e9fa9bcc85fd31d4548870aad27c0593f64c433 (patch) | |
tree | f5041cc3a610f25fb1cc2a00fd593033e185fd89 | |
parent | ffa6e473fc95d1980b230195fecdafcd7193dca7 (diff) |
xdg-screensaver: Change screensaver_freedesktop's interpretation of GetActive (BR29859)
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | scripts/xdg-screensaver.in | 8 |
2 files changed, 5 insertions, 4 deletions
@@ -2,6 +2,7 @@ 2015-01-15 Reuben Thomas <rrt@sc3d.org> * xdg-mime: dereference symlinks when using mimetype or file (BR39923) + * xdg-screensaver: Change screensaver_freedesktop's interpretation of GetActive (BR29859) 2015-01-05 Rex Dieter <rdieter@fedoraproject.org> * xdg-open: command injection vulnerability (BR66670) diff --git a/scripts/xdg-screensaver.in b/scripts/xdg-screensaver.in index d9cb4d2..579b80e 100644 --- a/scripts/xdg-screensaver.in +++ b/scripts/xdg-screensaver.in @@ -300,13 +300,13 @@ screensaver_freedesktop() org.freedesktop.ScreenSaver.GetActive \ | grep boolean | cut -d ' ' -f 5` result=$? - if [ x"$status" = "xtrue" ]; then + if [ x"$status" = "xtrue" -o x"$status" = "xfalse" ]; then echo "enabled" - elif [ x"$status" = "xfalse" ]; then - echo "disabled" - else + elif [ x"$result" != "x0" ]; then echo "ERROR: dbus org.freedesktop.ScreenSaver.GetActive returned '$status'" >&2 return 1 + else + echo "disabled" fi ;; |