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

List:       xine-cvslog
Subject:    [xine-cvs] HG: gxine: Merge.
From:       Darren Salt <linux () youmustbejoking ! demon ! co ! uk>
Date:       2009-03-25 16:53:01
Message-ID: cd3bc9c847dd80635131.1237999748 () hg ! debian ! org
[Download RAW message or body]

# HG changeset patch
# User Darren Salt <linux@youmustbejoking.demon.co.uk>
# Date 1237999748 0
# Node ID cd3bc9c847dd80635131fc417d2349e34801706f
# Parent  d8429ee4ec10e53f271429d079be75b5fa7d8b1a
# Parent  74fa952950a232a740d0009b52182a5a0e189f3c
Merge.

diff -r cd3bc9c847dd80635131fc417d2349e34801706f -r \
                d8429ee4ec10e53f271429d079be75b5fa7d8b1a src/gtkvideo.c
--- a/src/gtkvideo.c	Wed Mar 25 16:49:08 2009 +0000
+++ b/src/gtkvideo.c	Wed Mar 25 16:42:42 2009 +0000
@@ -1321,11 +1321,9 @@ static void gtk_video_realize (GtkWidget
   priv->pointer_visible = TRUE;
   XUnlockDisplay (xdisplay);
 
+#ifdef XDG_SCREENSAVER_COMMAND
   priv->xdg_active = 0;
-#ifdef XDG_SCREENSAVER_COMMAND
   priv->have_xdg_screensaver = !xdg_screensaver_poke ("--help", 0);
-#else
-  priv->have_xdg_screensaver = 0;
 #endif
   priv->screen_blanker_timeout =
     g_timeout_add (4000, (GSourceFunc) gtv_screen_blanker_cb, gtv);

------------------------------------------------------------------------------
_______________________________________________
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]