[sawfish] update GNOME-Check

[Christopher Bratusek <chrisb src gnome org>]

commit c1826003283d03a6411419a45107aabe8726d6ee
Author: chrisb <zanghar freenet de>
Date:   Fri Jul 24 20:48:46 2009 +0200

    update GNOME-Check

 ChangeLog                   |    2 ++
 lisp/sawfish/wm/defaults.jl |    8 ++------
 man/news.texi               |    4 +++-
 3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 865d3a8..8e842f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
 
 	* lisp/sawfish/wm/ext/infinite-desktop.jl: fixed cursor warping [Jeremy Hankins]
 
+	* lisp/sawfish/wm/defaults.jl: update GNOME-Check for recent versions [Alexey I. Froloff]
+
 2009-07-18  Christopher Bratusek <zanghar freenet de>
 	* lisp/sawfish/gtk/widget.jl: 	- allow negative values in spinbuttons in sawfish-ui
 					- connect spinbuttons to value-changed signal (allows typing in the value manually)
diff --git a/lisp/sawfish/wm/defaults.jl b/lisp/sawfish/wm/defaults.jl
index dce0731..c6e9189 100644
--- a/lisp/sawfish/wm/defaults.jl
+++ b/lisp/sawfish/wm/defaults.jl
@@ -31,12 +31,8 @@
 ;; if it looks like GNOME is the desktop environment, then load the
 ;; extra GNOME integration module
 (unless batch-mode
-  (catch 'out
-    (mapc (lambda (prop)
-	    (when (string-match "^GNOME_" (symbol-name prop))
-	      (require 'sawfish.wm.gnome.integration)
-	      (throw 'out t)))
-	  (list-x-properties 'root))))
+  (if (getenv "GNOME_DESKTOP_SESSION_ID")
+    (require 'sawfish.wm.gnome.integration)))
 
 ;; save errors to aid debugging
 (require 'sawfish.wm.ext.error-handler)
diff --git a/man/news.texi b/man/news.texi
index a64ae1d..8148c5f 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -40,10 +40,12 @@ they occurred between. For more detailed information see the
 @item Other Changes:
 @itemize @minus
 
- item Sawfish-Ui does now allow negative values in Spinbuttons [Christopher Bratusek]
+ item Sawfish-Ui does now allow negative values in SpinButtons by default [Christopher Bratusek]
 
 @item Sawfish does now appear in KDE4s WM Selector [Christopher Bratusek]
 
+ item Update GNOME-Detection [Alexey I. Froloff]
+
 @item Changing raise-tabs-on-hover takes effect immediately now [Christopher Bratusek]
 
 @item Add --tag=CC to libtool where necessary, unbrakes compilation on some arches [Gentoo]