63 lines
1.5 KiB
Diff
63 lines
1.5 KiB
Diff
From aa251a926130fbd3f4bade766ce5d2e0e2cb4c73 Mon Sep 17 00:00:00 2001
|
|
From: Rex Dieter <rdieter@math.unl.edu>
|
|
Date: Thu, 9 Oct 2014 09:35:21 -0500
|
|
Subject: [PATCH 26/26] xdg-screensaver plasma5 support
|
|
|
|
---
|
|
ChangeLog | 3 +++
|
|
scripts/xdg-screensaver.in | 16 ++++++++++------
|
|
2 files changed, 13 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/ChangeLog b/ChangeLog
|
|
index 077fb52..3399286 100644
|
|
--- a/ChangeLog
|
|
+++ b/ChangeLog
|
|
@@ -1,5 +1,8 @@
|
|
=== xdg-utils 1.1.x ===
|
|
|
|
+2014-10-09 Rex Dieter <rdieter@fedoraproject.org>
|
|
+ * xdg-screensaver plasma5 support
|
|
+
|
|
2014-09-22 Rex Dieter <rdieter@fedoraproject.org>
|
|
* Initial support for Plasma5 (largely thanks to Karol Herbst)
|
|
|
|
diff --git a/scripts/xdg-screensaver.in b/scripts/xdg-screensaver.in
|
|
index 8315f6a..6ad9930 100644
|
|
--- a/scripts/xdg-screensaver.in
|
|
+++ b/scripts/xdg-screensaver.in
|
|
@@ -86,13 +86,17 @@ perform_action()
|
|
|
|
case "$DE" in
|
|
kde)
|
|
- if [ x"$KDE_SESSION_VERSION" = x"4" ]; then
|
|
- screensaver_freedesktop "$1"
|
|
- else
|
|
- screensaver_kde "$1"
|
|
+ if [ -n "${KDE_SESSION_VERSION}" ]; then
|
|
+ case "${KDE_SESSION_VERSION}" in
|
|
+ 4|5)
|
|
+ screensaver_freedesktop "$1"
|
|
+ ;;
|
|
+ *)
|
|
+ screensaver_kde3 "$1"
|
|
+ ;;
|
|
+ esac
|
|
fi
|
|
;;
|
|
-
|
|
gnome_screensaver)
|
|
screensaver_gnome_screensaver "$1"
|
|
;;
|
|
@@ -314,7 +318,7 @@ screensaver_freedesktop()
|
|
esac
|
|
}
|
|
|
|
-screensaver_kde()
|
|
+screensaver_kde3()
|
|
{
|
|
case "$1" in
|
|
suspend)
|
|
--
|
|
1.9.3
|
|
|