From ad1e23ce7d99def1d315f3e25a037f2eec6bc4d0 Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Fri, 14 Feb 2014 10:10:20 -0500
Subject: [PATCH] idle-monitor: avoid XSyncBadAlarm X error

If we fail to find the IDLETIME counter, then the alarm variable will be
uninitialised.  Most code paths are careful to check this before
submitting XSync calls, but there is one check missing.

https://bugzilla.gnome.org/show_bug.cgi?id=724364
---
 src/core/meta-idle-monitor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/meta-idle-monitor.c b/src/core/meta-idle-monitor.c
index 77d26f390..eda92893f 100644
--- a/src/core/meta-idle-monitor.c
+++ b/src/core/meta-idle-monitor.c
@@ -499,7 +499,7 @@ make_watch (MetaIdleMonitor           *monitor,
       if (meta_idle_monitor_get_idletime (monitor) > (gint64)timeout_msec)
         watch->idle_source_id = g_idle_add (fire_watch_idle, watch);
     }
-  else
+  else if (monitor->user_active_alarm != None)
     {
       watch->xalarm = monitor->user_active_alarm;