Merge lp:~raof/gnome-session/fix-bug-623700 into lp:~ubuntu-desktop/gnome-session/ubuntu

[Chris Halse Rogers]

Fix a corner-case in the session idle code: bug #623700

[Robert Ancell (robert-ancell)]

There doesn't seem to agreement upstream as to if this is a correct fix (and I suspect not enough people, including me, know enough about this to say either way).
Is there a test case to trigger it?
Also, is this intended for maverick or natty or both?

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-06 09:46:40 +0000
+++ debian/changelog	2010-08-25 03:05:57 +0000
@@ -1,3 +1,11 @@
+gnome-session (2.31.6-0ubuntu2) maverick; urgency=low
+
+  * debian/patches/102_fix_negative_transition_in_idletime.patch:
+    - Fix race in idle handling which could result in a session being marked
+      as idle not being marked as active on user activity.  (LP: #623700)
+
+ -- Christopher James Halse Rogers <[e-mail]>  Wed, 25 Aug 2010 11:51:55 +1000
+
 gnome-session (2.31.6-0ubuntu1) maverick; urgency=low
 
   * New upstream version:

=== added file 'debian/patches/102_fix_negative_transition_in_idletime.patch'
--- debian/patches/102_fix_negative_transition_in_idletime.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/102_fix_negative_transition_in_idletime.patch	2010-08-25 03:05:57 +0000
@@ -0,0 +1,22 @@
+Description: Fix race condition in session idle->active detection
+ .
+ There's a chance that a user could generate some X input on the same tick that
+ the active->idle threshold is reached.  In this case the idle alarm will get 
+ fired, but because IDLETIME never *passed* the threshold the idle->active
+ alarm will never get fired.
+Author: Christopher James Halse Rogers <[e-mail]>
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=627903
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/623700
+
+=== modified file 'gnome-session/gs-idle-monitor.c'
+--- a/gnome-session/gs-idle-monitor.c	2009-07-14 20:36:58 +0000
++++ b/gnome-session/gs-idle-monitor.c	2010-08-24 22:43:28 +0000
+@@ -459,6 +459,7 @@
+                 watch->xalarm_positive = XSyncCreateAlarm (GDK_DISPLAY (), flags, &attr);
+         }
+ 
++        attr.trigger.wait_value = _int64_to_xsyncvalue (_xsyncvalue_to_int64 (watch->interval) - 1);
+         attr.trigger.test_type = XSyncNegativeTransition;
+         if (watch->xalarm_negative != None) {
+                 g_debug ("GSIdleMonitor: updating alarm for negative transition wait=%lld",
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-08-06 08:43:11 +0000
+++ debian/patches/series	2010-08-25 03:05:57 +0000
@@ -15,3 +15,4 @@
 97_fix_query_end_session_crash.patch
 100_fix_xsmp_stop_crash.patch
 101_screen_lock_on_suspend.patch
+102_fix_negative_transition_in_idletime.patch