Attachment 315139 Details for Bug 450425 – updated gnome-screensaver patch for xflock and /etc/xdg/xfce4/xinitrc

[patch] updated gnome-screensaver patch for xflock and /etc/xdg/xfce4/xinitrc

xfce-utils-4.4.2-gnome-screensaver.patch (text/plain), 1.44 KB, created by Christoph Wickert on 2008-08-27 20:40:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christoph Wickert

Created: 2008-08-27 20:40:54 UTC

Size: 1.44 KB

patch

obsolete

>diff -dur xfce-utils-4.4.2.orig/scripts/xflock4 xfce-utils-4.4.2/scripts/xflock4
>--- xfce-utils-4.4.2.orig/scripts/xflock4	2007-11-17 20:31:32.000000000 +0100
>+++ xfce-utils-4.4.2/scripts/xflock4	2008-08-02 04:15:55.000000000 +0200
>@@ -19,10 +19,10 @@
> #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
> #
> 
>-if test x"`which xscreensaver-command 2>/dev/null`" != x""; then
>-    xscreensaver-command -lock 
>-elif test x"`which gnome-screensaver-command 2>/dev/null`" != x""; then
>+if ps ux | grep gnome-[s]creensaver > /dev/null 2>&1; then
>     gnome-screensaver-command --lock
>+elif ps ux | grep x[s]creensaver > /dev/null 2>&1; then
>+    xscreensaver-command -lock
> else
>     xlock $*
> fi
>diff -dur xfce-utils-4.4.2.orig/scripts/xinitrc.in xfce-utils-4.4.2/scripts/xinitrc.in
>--- xfce-utils-4.4.2.orig/scripts/xinitrc.in	2007-11-17 20:31:32.000000000 +0100
>+++ xfce-utils-4.4.2/scripts/xinitrc.in	2008-08-02 04:10:12.000000000 +0200
>@@ -55,10 +55,10 @@
> 
> # Launch xscreensaver (if available), but only as non-root user
> if test $UID -gt 0 -a -z "$VNCSESSION"; then 
>-    if test x"`which xscreensaver 2>/dev/null`" != x""; then
>-        xscreensaver -no-splash &
>-    elif test x"`which gnome-screensaver 2>/dev/null`" != x""; then
>+    if test x"`which gnome-screensaver 2>/dev/null`" != x""; then
>         gnome-screensaver &
>+    elif test x"`which xscreensaver 2>/dev/null`" != x""; then
>+        xscreensaver -no-splash &
>     fi
> fi 
>

Actions: View | Diff

Attachments on bug 450425: 308634 | 308635 | 315121 | 315139