[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xine-cvslog
Subject:    [xine-cvs] HG: gxine: Disable use of xdg-screensaver by default.
From:       Darren Salt <linux () youmustbejoking ! demon ! co ! uk>
Date:       2009-03-25 16:52:57
Message-ID: 49021c464d4c474b2179.1237999258 () hg ! debian ! org
[Download RAW message or body]

# HG changeset patch
# User Darren Salt <linux@youmustbejoking.demon.co.uk>
# Date 1237999258 0
# Node ID 49021c464d4c474b21793eb078aea26e31efce1f
# Parent  f2c4b5864653601480210efe33c56ffd728e6087
Disable use of xdg-screensaver by default. Seems broken to me wrt DPMS.

diff -r 49021c464d4c474b21793eb078aea26e31efce1f -r f2c4b5864653601480210efe33c56ffd728e6087 ChangeLog
--- a/ChangeLog	Wed Mar 25 16:40:58 2009 +0000
+++ b/ChangeLog	Wed Mar 25 16:29:36 2009 +0000
@@ -10,7 +10,7 @@ 0.5.904: 2008/??/??
 	* Add x-content/video-dvd etc. to the MIME types list in the desktop
 	  file (via X-gxine-MimeType for auto-generation reasons).
 	* Use and prefer to use xdg-screensaver (where available) for
-	  screensaver defeating.
+	  screensaver defeating. Disabled by default.
 
 0.5.903: 2008/06/12
 	* Apply auto-detection of DVD and VCD images to files & directories
diff -r 49021c464d4c474b21793eb078aea26e31efce1f -r f2c4b5864653601480210efe33c56ffd728e6087 configure.ac
--- a/configure.ac	Wed Mar 25 16:40:58 2009 +0000
+++ b/configure.ac	Wed Mar 25 16:29:36 2009 +0000
@@ -173,9 +173,14 @@ dnl ------------------------------------
 dnl ---------------------------------------------
 dnl Screensaver commands
 dnl ---------------------------------------------
-AC_ARG_VAR([XDGSSCMD], [full pathname for xdg-screensaver (auto-detect, 'no' to disable)])
+AC_ARG_VAR([XDGSSCMD], [full pathname for xdg-screensaver (disabled, 'yes' to auto-detect)])
 AC_ARG_VAR([GSSCMD], [full pathname for gnome-screensaver-command (auto-detect, 'no' to disable)])
 AC_ARG_VAR([XSSCMD], [full pathname for xscreensaver-command (auto-detect, 'no' to disable)])
+
+dnl Disable XDG screensaver by default
+if test "$XDGSSCMD" = ''; then
+  XDGSSCMD=no
+fi
 
 GXINE_SCREENSAVER_CMD([XDGSSCMD], [XDG], [xdg-screensaver])
 GXINE_SCREENSAVER_CMD([GSSCMD], [GNOME], [gnome-screensaver],
diff -r 49021c464d4c474b21793eb078aea26e31efce1f -r f2c4b5864653601480210efe33c56ffd728e6087 m4/_gxine.m4
--- a/m4/_gxine.m4	Wed Mar 25 16:40:58 2009 +0000
+++ b/m4/_gxine.m4	Wed Mar 25 16:29:36 2009 +0000
@@ -114,7 +114,10 @@ dnl Args: config variable, #define varia
 dnl Args: config variable, #define variable prefix, binary name,
 dnl       extra commands if found (optional)
 AC_DEFUN([GXINE_SCREENSAVER_CMD],
-   [if test "$$1" != no; then
+   [if test "$$1" = yes; then
+      $1=
+    fi
+    if test "$$1" != no; then
       AC_PATH_PROG([$1], [$3])
       if test -n "$$1"; then
         AC_DEFINE_UNQUOTED([$2_SCREENSAVER_COMMAND], ["$$1"], [location of the $3 binary])

------------------------------------------------------------------------------
_______________________________________________
Xine-cvslog mailing list
Xine-cvslog@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
[prev in list] [next in list] [prev in thread] [next in thread]