Index: gnome-session-2.30.0/gnome-session/gsm-presence.c
===================================================================
--- gnome-session-2.30.0.orig/gnome-session/gsm-presence.c	2009-07-30 07:37:56.000000000 -0400
+++ gnome-session-2.30.0/gnome-session/gsm-presence.c	2010-08-13 23:59:54.646315493 -0400
@@ -138,6 +138,9 @@
         }
 }
 
+static void
+reset_idle_watch (GsmPresence  *presence);
+
 static gboolean
 on_idle_timeout (GSIdleMonitor *monitor,
                  guint          id,
@@ -148,6 +151,8 @@
 
         handled = TRUE;
         set_session_idle (presence, condition);
+        /* Fix Heisenbug of session idle watch not being reset sometimes? */
+        reset_idle_watch (presence);
 
         return handled;
 }
