gnome-session r5301 - in trunk: . gnome-session

[matthiasc svn gnome org]

Author: matthiasc
Date: Thu Feb 26 20:42:28 2009
New Revision: 5301
URL: http://svn.gnome.org/viewvc/gnome-session?rev=5301&view=rev

Log:
        * gnome-session/gs-idle-monitor.c: Ask for AlertNotify in a way
        that XSync understands. (#567958)



Modified:
   trunk/ChangeLog
   trunk/gnome-session/gs-idle-monitor.c

Modified: trunk/gnome-session/gs-idle-monitor.c
==============================================================================
--- trunk/gnome-session/gs-idle-monitor.c	(original)
+++ trunk/gnome-session/gs-idle-monitor.c	Thu Feb 26 20:42:28 2009
@@ -273,13 +273,6 @@
                 return FALSE;
         }
 
-        /* select for sync events */
-        gdk_error_trap_push ();
-        XSelectInput (GDK_DISPLAY (), GDK_ROOT_WINDOW (), XSyncAlarmNotifyMask);
-        if (gdk_error_trap_pop ()) {
-                g_warning ("XSelectInput failed");
-        }
-
         gdk_window_add_filter (NULL, (GdkFilterFunc)xevent_filter, monitor);
 
         return TRUE;
@@ -440,13 +433,15 @@
                 | XSyncCAValueType
                 | XSyncCATestType
                 | XSyncCAValue
-                | XSyncCADelta;
+                | XSyncCADelta
+                | XSyncCAEvents;
 
         XSyncIntToValue (&delta, 0);
         attr.trigger.counter = monitor->priv->counter;
         attr.trigger.value_type = XSyncAbsolute;
         attr.trigger.wait_value = watch->interval;
         attr.delta = delta;
+        attr.events = TRUE;
 
         attr.trigger.test_type = XSyncPositiveTransition;
         if (watch->xalarm_positive != None) {