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

List:       xine-cvslog
Subject:    [xine-cvs] HG: gxine: No point in retrying if xdg-screensaver
From:       Darren Salt <linux () youmustbejoking ! demon ! co ! uk>
Date:       2009-01-21 21:29:42
Message-ID: c9f7e29a7fd99d49d73d.1232573338 () hg ! debian ! org
[Download RAW message or body]

# HG changeset patch
# User Darren Salt <linux@youmustbejoking.demon.co.uk>
# Date 1232573338 0
# Node ID c9f7e29a7fd99d49d73d8d0e856faf1185005f9d
# Parent  c13ed634eb635db3299949b9916da77abc9ea6e2
No point in retrying if xdg-screensaver suddenly isn' there any more.

diff -r c9f7e29a7fd99d49d73d8d0e856faf1185005f9d -r \
                c13ed634eb635db3299949b9916da77abc9ea6e2 src/gtkvideo.c
--- a/src/gtkvideo.c	Wed Jan 21 21:28:58 2009 +0000
+++ b/src/gtkvideo.c	Wed Jan 21 21:18:55 2009 +0000
@@ -2254,8 +2254,11 @@ static gboolean gtv_unblank_screen (GtkV
       Window id = inhibit
 		? gdk_x11_drawable_get_xid (gtk_widget_get_toplevel (&gtv->widget)->window)
 		: gtv->priv->xdg_active;
-      if (!id || !xdg_screensaver_poke (inhibit ? "suspend" : "resume", id))
+      int ret = 0;
+      if (!id || !(ret = xdg_screensaver_poke (inhibit ? "suspend" : "resume", id)))
       {
+        if (ret < 0) /* if this happens, xdg-screensaver isn't there */
+          gtv->priv->have_xdg_screensaver = 0;
         gtv->priv->xdg_active = inhibit ? id : 0;
 	return FALSE;
       }

------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
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]